Merge pull request #158 from neonevm/fix-ci

fix dockerize
neonevm · Dec 1, 2023 · 7bcb9dd · 7bcb9dd
2 parents 659c3f3 + d885c42
commit 7bcb9dd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/.github/actions/dockerize-neon-tests/action.yml b/.github/actions/dockerize-neon-tests/action.yml
@@ -4,6 +4,9 @@ inputs:
   image_tag:  # id of input
     description: 'neon tests image tag'
     required: true
+  org_name:
+    description: 'docker hub organization name'
+    required: true
   oz_branch:
     description: 'branch name for oz tests'
     required: true
@@ -26,7 +29,7 @@ runs:
       id: docker_pipeline
       shell: bash
       run: |
-        image_id="${{ vars.DOCKERHUB_ORG_NAME }}/neon_tests"
+        image_id="${{ inputs.org_name }}/neon_tests"
         delimeter=$(printf "%0.s-" {1..30})
         echo " ${delimeter} Build new docker image ${image_id} ${delimeter}"
         docker build . --no-cache --tag ${image_id}:${{ inputs.image_tag }} --build-arg OZ_BRANCH='${{ inputs.oz_branch }}'

diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
@@ -59,6 +59,7 @@ jobs:
         uses: ./.github/actions/dockerize-neon-tests
         with:
           image_tag: ${{ github.sha }}
+          org_name: ${{ vars.DOCKERHUB_ORG_NAME }}
           docker_username: ${{ secrets.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}
   prepare-env:

diff --git a/.github/workflows/economy.yml b/.github/workflows/economy.yml
@@ -39,6 +39,7 @@ jobs:
         id: requirements
         uses: ./.github/actions/dockerize-neon-tests
         with:
+          org_name: ${{ vars.DOCKERHUB_ORG_NAME }}
           image_tag: ${{ github.sha }}
           docker_username: ${{ secrets.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}

diff --git a/.github/workflows/openzeppelin.yml b/.github/workflows/openzeppelin.yml
@@ -45,6 +45,7 @@ jobs:
         uses: ./.github/actions/dockerize-neon-tests
         with:
           image_tag: ${{ github.sha }}
+          org_name: ${{ vars.DOCKERHUB_ORG_NAME }}
           docker_username: ${{ secrets.DOCKER_USERNAME }}
           docker_password: ${{ secrets.DOCKER_PASSWORD }}
   prepare-env:

diff --git a/Dockerfile b/Dockerfile
@@ -77,6 +77,7 @@ RUN mkdir -p ${DOWNLOAD_PATH} && \
     chmod -R 755 ${DOWNLOAD_PATH}
 
 COPY deploy/infra/compile_contracts.sh compatibility/openzeppelin-contracts
+RUN chmod +x compatibility/openzeppelin-contracts/compile_contracts.sh
 RUN cd compatibility/openzeppelin-contracts npm set audit false
 RUN cd compatibility/openzeppelin-contracts && npm ci
 RUN cd compatibility/openzeppelin-contracts && ./compile_contracts.sh