Fix sentry and custom version scripts (#4510)

* Sentry scripts * Sentry scripts * Sentry scripts * Sentry scripts * Sentry scripts * Sentry scripts * Sentry scripts * Sentry scripts * Sentry scripts * Sentry scripts * Sentry scripts * Sentry scripts
saleor · Dec 1, 2023 · 3086f43 · 3086f43
1 parent bf352cf
commit 3086f43
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/.changeset/curvy-houses-nail.md b/.changeset/curvy-houses-nail.md
@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": patch
+---
+
+Fix sentry upload and custom version scripts
diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml
@@ -34,8 +34,9 @@ jobs:
       - name: Set sentry release
         run: |
           HASH=$(git rev-parse --short HEAD)
-          VERSION=$(jq -r .version package.json)
-          echo "SENTRY_RELEASE=${VERSION}-${HASH}" >> $GITHUB_ENV
+          CURRENT_VERSION=$(jq -r .version package.json)
+          RELEASE="${CURRENT_VERSION}-${HASH}"
+          echo "SENTRY_RELEASE=${RELEASE}" >> $GITHUB_ENV
       - name: Package
         timeout-minutes: 15
         run: |

diff --git a/.github/workflows/deploy-master-staging.yaml b/.github/workflows/deploy-master-staging.yaml
@@ -25,8 +25,9 @@ jobs:
         run: |
           HASH=$(git rev-parse --short HEAD)
           CURRENT_VERSION=$(jq -r .version package.json)
-          echo "CUSTOM_VERSION=${CURRENT_VERSION}-${HASH}" >> $GITHUB_ENV
-          echo "SENTRY_RELEASE=$CUSTOM_VERSION" >> $GITHUB_ENV
+          RELEASE="${CURRENT_VERSION}-${HASH}"
+          echo "CUSTOM_VERSION=${RELEASE}" >> $GITHUB_ENV
+          echo "SENTRY_RELEASE=${RELEASE}" >> $GITHUB_ENV
       - name: Setup Node
         uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
@@ -50,9 +50,12 @@ jobs:
         # Add commit hash to basic version number
         run: |
           set -x
-          hash=$(git rev-parse --short HEAD)
-          echo "CUSTOM_VERSION=${VERSION}-${hash}" >> $GITHUB_ENV
-          echo "SENTRY_RELEASE=$CUSTOM_VERSION" >> $GITHUB_ENV
+          HASH=$(git rev-parse --short HEAD)
+          CURRENT_VERSION=$(jq -r .version package.json)
+          RELEASE="${CURRENT_VERSION}-${HASH}"
+          echo "CUSTOM_VERSION=${RELEASE}" >> $GITHUB_ENV
+          echo "SENTRY_RELEASE=${RELEASE}" >> $GITHUB_ENV
+
       - name: Setup Node
         uses: actions/setup-node@v3
         with:

diff --git a/scripts/sentry-upload.sh b/scripts/sentry-upload.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [[ -z "${SENTRY_ORG}" ]]; then
   echo "Sentry not definied. Skipping uploading..."
 else