It turns out that GITHUB_SHA is not equivalente to CIRCLE_SHA1

stellar · Mar 1, 2022 · c89957e · c89957e
1 parent 05e96e3
commit c89957e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/horizon-master.yml b/.github/workflows/horizon-master.yml
@@ -39,6 +39,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Get image tag (long sha)
+        shell: bash
+        id: get_tag
+        run: echo ::set-output name=TAG::$(git rev-parse HEAD)
+
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
@@ -50,7 +55,7 @@ jobs:
         with:
           # TODO: Commented out until we disable the CircleCI jobs
           # push: true
-          tags: stellar/ledger-state-diff:${{ github.sha }},stellar/ledger-state-diff:latest
+          tags: stellar/ledger-state-diff:${{ steps.get_tag.outputs.TAG }},stellar/ledger-state-diff:latest
           file: exp/tools/dump-ledger-state/Dockerfile
-          build-args: GITCOMMIT=${{ github.sha }}
+          build-args: GITCOMMIT=${{ steps.get_tag.outputs.TAG }}
           no-cache: true
diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml
@@ -73,7 +73,7 @@ jobs:
       run: |
         docker build -f services/horizon/docker/verify-range/Dockerfile -t stellar/horizon-verify-range services/horizon/docker/verify-range/
         # Any range should do for basic testing, this range was chosen pretty early in history so that it only takes a few mins to run
-        docker run -e BRANCH=${GITHUB_SHA} -e FROM=10000063 -e TO=10000127 stellar/horizon-verify-range
+        docker run -e BRANCH=$(git rev-parse --short HEAD) -e FROM=10000063 -e TO=10000127 stellar/horizon-verify-range
 
     # Push
     - if: ${{ github.ref == 'master' }}