echo on more

litentry · May 15, 2024 · 93d562a · 93d562a
1 parent c00d75b
commit 93d562a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/create-release-draft.yml b/.github/workflows/create-release-draft.yml
@@ -129,10 +129,7 @@ jobs:
       - name: Set env
         run: |
           PARACHAIN_DOCKER_TAG=$(echo ${{ env.RELEASE_TAG }} | cut -d'-' -f1 | sed 's/p/v/')
-          WORKER_DOCKER_TAG=$(echo ${{ env.RELEASE_TAG }} | sed 's/.*w/v/;s/-.*//')
-
           echo "PARACHAIN_DOCKER_TAG-------: $PARACHAIN_DOCKER_TAG"
-          echo "WORKER_DOCKER_TAG-------: $WORKER_DOCKER_TAG"
           echo "PARACHAIN_DOCKER_TAG=$PARACHAIN_DOCKER_TAG" >> $GITHUB_ENV
 
       - name: Build docker image
@@ -200,6 +197,7 @@ jobs:
       - name: Set env
         run: |
           WORKER_DOCKER_TAG=$(echo ${{ env.RELEASE_TAG }} | cut -d'-' -f1 | sed 's/p/v/')
+          echo "WORKER_DOCKER_TAG-------: $WORKER_DOCKER_TAG"
           echo "WORKER_DOCKER_TAG=$WORKER_DOCKER_TAG" >> $GITHUB_ENV
 
       - name: Build local builder

diff --git a/.github/workflows/release-ts-api-package.yml b/.github/workflows/release-ts-api-package.yml
@@ -19,23 +19,26 @@ jobs:
       - name: Set ENV
         run: |
           # extracting parachain version and worker version from release tag
-          echo "PARACHAIN_DOCKER_TAG=$(echo ${{ env.RELEASE_TAG }} | cut -d'-' -f1 | sed 's/p/v/')" >> $GITHUB_ENV
-          echo "WORKER_DOCKER_TAG=$(echo ${{ env.RELEASE_TAG }} | sed 's/.*w/v/;s/-.*//')" >> $GITHUB_ENV
-          echo "PARACHAIN_DOCKER_TAG-----: $PARACHAIN_DOCKER_TAG"
+          PARACHAIN_DOCKER_TAG=$(echo ${{ env.RELEASE_TAG }} | cut -d'-' -f1 | sed 's/p/v/')
+          echo "PARACHAIN_DOCKER_TAG-------: $PARACHAIN_DOCKER_TAG"
+          echo "PARACHAIN_DOCKER_TAG=$PARACHAIN_DOCKER_TAG" >> $GITHUB_ENV
+
+          WORKER_DOCKER_TAG=$(echo ${{ env.RELEASE_TAG }} | cut -d'-' -f1 | sed 's/p/v/')
           echo "WORKER_DOCKER_TAG-------: $WORKER_DOCKER_TAG"
+          echo "WORKER_DOCKER_TAG=$WORKER_DOCKER_TAG" >> $GITHUB_ENV
 
       - name: Pull litentry image optionally
         run: |
           docker pull parity/polkadot
-          docker pull litentry/litentry-worker:$WORKER_TAG
-          docker pull litentry/litentry-cli:$WORKER_TAG
-          docker pull litentry/litentry-parachain:$PARACHAIN_TAG
+          docker pull litentry/litentry-worker:$WORKER_DOCKER_TAG
+          docker pull litentry/litentry-cli:$WORKER_DOCKER_TAG
+          docker pull litentry/litentry-parachain:$PARACHAIN_DOCKER_TAG
 
       - name: Re-tag docker image
         run: |
-          docker tag litentry/litentry-worker:$WORKER_TAG litentry/litentry-worker:latest
-          docker tag litentry/litentry-cli:$WORKER_TAG litentry/litentry-cli:latest
-          docker tag litentry/litentry-parachain:$PARACHAIN_TAG litentry/litentry-parachain:latest
+          docker tag litentry/litentry-worker:$WORKER_DOCKER_TAG litentry/litentry-worker:latest
+          docker tag litentry/litentry-cli:$WORKER_DOCKER_TAG litentry/litentry-cli:latest
+          docker tag litentry/litentry-parachain:$PARACHAIN_DOCKER_TAG litentry/litentry-parachain:latest
 
       - run: docker images --all