Merge pull request #229 from skalenetwork/task/SKALE-3596-intel-submission-3

Task/skale 3596 intel submission 3

.github/workflows/dockerimagerelease.yml

@@ -5,8 +5,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-18.04
-    env: 
-      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+    env:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
     steps:
@@ -19,7 +18,7 @@ jobs:
         run: git submodule update --init --recursive
       - name: build
         run: python3 scripts/docker_build.py Dockerfile sgxwallet ${GITHUB_SHA}
-      - name: build image
+      - name: build and deploy docker image
         if: |
           contains(github.ref, 'develop') || contains(github.ref, 'beta') ||
           contains(github.ref, 'master') || contains(github.ref, 'stable') ||
@@ -35,22 +34,6 @@ jobs:
           export RELEASE=true
           echo "::set-env name=RELEASE::$RELEASE"
           bash ./scripts/build_image.sh DockerfileRelease sgxwallet_release
-
-      - name: deploy docker image
-        if: |
-          contains(github.ref, 'develop') || contains(github.ref, 'beta') ||
-          contains(github.ref, 'master') || contains(github.ref, 'stable') ||
-          contains(github.ref, 'SECURE_ENCLAVE_CHANGES')
-        run : |
-          export BRANCH=${GITHUB_REF##*/}
-          echo "Branch $BRANCH"
-          export VERSION=$(cat VERSION)
-          echo "Version $VERSION"
-          export VERSION=$(bash ./scripts/calculate_version.sh $BRANCH $VERSION)
-          echo "::set-env name=VERSION::$VERSION"
-          echo "Version $VERSION"
-          export RELEASE=true
-          echo "::set-env name=RELEASE::$RELEASE"
           bash ./scripts/publish_image.sh sgxwallet_release
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: true

.github/workflows/dockerimagesim.yml

@@ -19,25 +19,11 @@ jobs:
     - uses: actions/checkout@v1
     - name: submodule update
       run: git submodule update --init --recursive
-    - name: build container for release
-      if: |
-        contains(github.ref, 'develop') || contains(github.ref, 'beta') ||
-        contains(github.ref, 'master') || contains(github.ref, 'stable') ||
-        contains(github.ref, 'SECURE_ENCLAVE_CHANGES')
-      run: |
-        export BRANCH=${GITHUB_REF##*/}
-        echo "Branch $BRANCH"
-        export VERSION=$(cat VERSION)
-        echo "Version $VERSION"
-        export VERSION=$(bash ./scripts/calculate_version.sh $BRANCH $VERSION)
-        echo "::set-env name=VERSION::$VERSION"
-        echo "Version $VERSION"
-        bash ./scripts/build_image.sh DockerfileSimulation sgxwallet_sim
     - name: build container for testing
       run: python3 scripts/docker_build.py DockerfileSimulation sgxwalletsim ${GITHUB_SHA}
     - name: test
       run: python3 scripts/docker_test.py DockerfileSimulation sgxwalletsim
-    - name: deploy docker image
+    - name: build and deploy docker image
       if: |
             contains(github.ref, 'develop') || contains(github.ref, 'beta') ||
             contains(github.ref, 'master') || contains(github.ref, 'stable') ||
@@ -50,6 +36,7 @@ jobs:
         echo "Version $VERSION"
         export RELEASE=true
         echo "::set-env name=RELEASE::$RELEASE"
+        bash ./scripts/build_image.sh DockerfileSimulation sgxwallet_sim
         bash ./scripts/publish_image.sh sgxwallet_sim
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true