From 8244c5be27c1019085519d84db2eb093510e60ee Mon Sep 17 00:00:00 2001
From: Ivan Shumkov <ivan@shumkov.ru>
Date: Tue, 7 Nov 2023 23:45:57 +0700
Subject: [PATCH] ci: fix sccache key and dashmate helper pulling

---
 .github/actions/docker/action.yaml     | 2 +-
 .github/workflows/tests-test-suite.yml | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/actions/docker/action.yaml b/.github/actions/docker/action.yaml
index a6cb98f2c76..2e34b86686b 100644
--- 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
index 606f3dbc5dd..46ae72e5cf1 100644
--- 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