ci: fix sccache key and dashmate helper pulling

dashpay · Nov 7, 2023 · 8244c5b · 8244c5b
1 parent eef8b26
commit 8244c5b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/actions/docker/action.yaml b/.github/actions/docker/action.yaml
@@ -158,7 +158,7 @@ runs:
           RUSTC_WRAPPER=sccache
           SCCACHE_BUCKET=${{ inputs.bucket }}
           SCCACHE_REGION=${{ inputs.region }}
-          SCCACHE_S3_KEY_PREFIX="${{ runner.os }}/sccache"
+          SCCACHE_S3_KEY_PREFIX=${{ runner.os }}/sccache
         platforms: ${{ steps.platforms.outputs.result }}
         push: ${{ fromJSON(inputs.push) }}
         cache-from: ${{ steps.layer_cache_settings.outputs.cache_from }}

diff --git a/.github/workflows/tests-test-suite.yml b/.github/workflows/tests-test-suite.yml
@@ -53,10 +53,10 @@ jobs:
           aws ecr get-login-password --region ${{ vars.AWS_REGION }} | docker login --username AWS --password-stdin $DOCKER_HUB_ORG
 
           SHA_TAG=sha-${{ github.sha }}
+          VERSION=$(cat package.json | jq -r '.version')
 
-          # Dashmate
           docker pull $DOCKER_HUB_ORG/dashmate_helper:$SHA_TAG
-          docker tag $DOCKER_HUB_ORG/dashmate_helper:$SHA_TAG dashpay/dashmate_helper:${{ github.sha }}
+          docker tag $DOCKER_HUB_ORG/dashmate_helper:$SHA_TAG dashpay/dashmate_helper:$VERSION
 
       - name: Get dashmate fingerprint
         id: dashmate-fingerprint
@@ -91,7 +91,6 @@ jobs:
           # DAPI
           yarn dashmate config set --config=local platform.dapi.api.docker.image $DOCKER_HUB_ORG/dapi:$SHA_TAG
 
-          # TODO: Move setup network to a separate job before test suite to do not run twice?
           ./scripts/setup_local_network.sh
           ./scripts/configure_test_suite.sh
           ./scripts/configure_dotenv.sh