diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a388a043..a2894a61 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -83,11 +83,12 @@ jobs: echo "prefix=${prefix}" } >> "${GITHUB_OUTPUT}" + # Sentry release is shoc-frontend@${GITHUB_SHA} via VITE_APP_COMMIT_SHA, + # distinct from the S3/Terraform version_label. - name: Upload private source maps run: bash scripts/upload-sourcemaps.sh env: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - SENTRY_RELEASE: ${{ steps.release.outputs.version_label }} - name: Read previous release pointer id: pointer diff --git a/scripts/upload-sourcemaps.sh b/scripts/upload-sourcemaps.sh index a5a91781..d790e674 100755 --- a/scripts/upload-sourcemaps.sh +++ b/scripts/upload-sourcemaps.sh @@ -6,18 +6,13 @@ set -euo pipefail SENTRY_ORG="${SENTRY_ORG:-seahaven}" SENTRY_PROJECT="${SENTRY_PROJECT:-shoc-frontend}" COMMIT_SHA="${VITE_APP_COMMIT_SHA:-${GITHUB_SHA:-}}" -RELEASE_LABEL="${SENTRY_RELEASE:-${RELEASE_LABEL:-}}" -if [[ -n "${RELEASE_LABEL}" ]]; then - RELEASE="${RELEASE_LABEL}" -else - if [[ ! "${COMMIT_SHA}" =~ ^[0-9a-fA-F]{40}$ ]]; then - echo "::error::Source-map upload requires a 40-character VITE_APP_COMMIT_SHA or GITHUB_SHA." >&2 - exit 1 - fi - COMMIT_SHA="$(printf '%s' "${COMMIT_SHA}" | tr '[:upper:]' '[:lower:]')" - RELEASE="shoc-frontend@${COMMIT_SHA}" +if [[ ! "${COMMIT_SHA}" =~ ^[0-9a-fA-F]{40}$ ]]; then + echo "::error::Source-map upload requires a 40-character VITE_APP_COMMIT_SHA or GITHUB_SHA." >&2 + exit 1 fi +COMMIT_SHA="$(printf '%s' "${COMMIT_SHA}" | tr '[:upper:]' '[:lower:]')" +RELEASE="shoc-frontend@${COMMIT_SHA}" npm exec --no -- sentry-cli sourcemaps upload \ --org "${SENTRY_ORG}" \