From f492000795ddee26a21b945cfe7900a8dca89f76 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 22 Jul 2025 18:22:10 -0500 Subject: [PATCH] Deprecate SENTRY_RELEASE since we use package.json now --- .env.example | 4 ---- .github/workflows/build-and-push-bskyweb-aws.yaml | 2 -- .github/workflows/build-submit-android.yml | 5 ++--- .github/workflows/build-submit-ios.yml | 3 +-- .github/workflows/bundle-deploy-eas-update.yml | 3 +-- Dockerfile | 5 +---- src/env.ts | 6 ------ src/logger/sentry/setup/index.ts | 2 +- webpack.config.js | 4 ++-- 9 files changed, 8 insertions(+), 26 deletions(-) diff --git a/.env.example b/.env.example index 0502fab41d..1df40f8bfb 100644 --- a/.env.example +++ b/.env.example @@ -32,10 +32,6 @@ SENTRY_DSN= # current bundle was made from. SENTRY_DIST=test -# Populates the `release` value on Sentry events. This is the version of the -# app specified in the package.json. -SENTRY_RELEASE=dev - # Bitdrift API key. If undefined, Bitdrift will be disabled. EXPO_PUBLIC_BITDRIFT_API_KEY= diff --git a/.github/workflows/build-and-push-bskyweb-aws.yaml b/.github/workflows/build-and-push-bskyweb-aws.yaml index 399e8669f0..6cf43bc76d 100644 --- a/.github/workflows/build-and-push-bskyweb-aws.yaml +++ b/.github/workflows/build-and-push-bskyweb-aws.yaml @@ -48,7 +48,6 @@ jobs: run: | echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT echo "SENTRY_DIST=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - echo "SENTRY_RELEASE=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT - name: Build and push Docker image id: build-and-push @@ -64,6 +63,5 @@ jobs: build-args: | EXPO_PUBLIC_BUNDLE_IDENTIFIER=${{ steps.vars.outputs.sha_short }} SENTRY_DIST=${{ steps.vars.outputs.SENTRY_DIST }} - SENTRY_RELEASE=${{ steps.vars.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} diff --git a/.github/workflows/build-submit-android.yml b/.github/workflows/build-submit-android.yml index e497d74175..977e852b55 100644 --- a/.github/workflows/build-submit-android.yml +++ b/.github/workflows/build-submit-android.yml @@ -74,10 +74,9 @@ jobs: id: sentry run: | echo "SENTRY_DIST=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - echo "SENTRY_RELEASE=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT - name: 🏗️ EAS Build - run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} yarn use-build-number-with-bump eas build -p android --profile ${{ inputs.profile || 'testflight-android' }} --local --output build.aab --non-interactive + run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} yarn use-build-number-with-bump eas build -p android --profile ${{ inputs.profile || 'testflight-android' }} --local --output build.aab --non-interactive - name: ✍️ Rename Testflight bundle if: ${{ inputs.profile != 'production' }} @@ -139,7 +138,7 @@ jobs: - name: 🏗️ Build Production APK if: ${{ inputs.profile == 'production' }} - run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} yarn use-build-number-with-bump eas build -p android --profile production-apk --local --output build.apk --non-interactive + run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} yarn use-build-number-with-bump eas build -p android --profile production-apk --local --output build.apk --non-interactive - name: 🚀 Upload Production APK Artifact id: upload-artifact-production-apk diff --git a/.github/workflows/build-submit-ios.yml b/.github/workflows/build-submit-ios.yml index 3998f71b7d..625ac4f70a 100644 --- a/.github/workflows/build-submit-ios.yml +++ b/.github/workflows/build-submit-ios.yml @@ -86,10 +86,9 @@ jobs: id: sentry run: | echo "SENTRY_DIST=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - echo "SENTRY_RELEASE=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT - name: 🏗️ EAS Build - run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} yarn use-build-number-with-bump eas build -p ios --profile ${{ inputs.profile || 'testflight' }} --local --output build.ipa --non-interactive + run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} yarn use-build-number-with-bump eas build -p ios --profile ${{ inputs.profile || 'testflight' }} --local --output build.ipa --non-interactive - name: 🚀 Deploy run: eas submit -p ios --non-interactive --path build.ipa diff --git a/.github/workflows/bundle-deploy-eas-update.yml b/.github/workflows/bundle-deploy-eas-update.yml index b462bf8fe3..b4a8509364 100644 --- a/.github/workflows/bundle-deploy-eas-update.yml +++ b/.github/workflows/bundle-deploy-eas-update.yml @@ -114,11 +114,10 @@ jobs: id: sentry run: | echo "SENTRY_DIST=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - echo "SENTRY_RELEASE=$(jq -r '.version' package.json)" >> $GITHUB_OUTPUT - name: 🏗️ Create Bundle if: ${{ !steps.fingerprint.outputs.includes-changes }} - run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export + run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export - name: 📦 Package Bundle and 🚀 Deploy if: ${{ !steps.fingerprint.outputs.includes-changes }} diff --git a/Dockerfile b/Dockerfile index 50dc28b4b3..182b293d66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,9 +33,6 @@ ARG RENDER_GIT_COMMIT # ARG SENTRY_AUTH_TOKEN ENV SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN:-unknown} -# Will fall back to package.json#version, but this is handled elsewhere -ARG SENTRY_RELEASE -ENV SENTRY_RELEASE=$SENTRY_RELEASE ARG SENTRY_DIST # Default to RENDER_GIT_COMMIT if not set by GitHub workflows ENV SENTRY_DIST=${SENTRY_DIST:-$RENDER_GIT_COMMIT} @@ -66,7 +63,7 @@ RUN \. "$NVM_DIR/nvm.sh" && \ yarn && \ yarn intl:build 2>&1 | tee i18n.log && \ if grep -q "invalid syntax" "i18n.log"; then echo "\n\nFound compilation errors!\n\n" && exit 1; else echo "\n\nNo compile errors!\n\n"; fi && \ - EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER EXPO_PUBLIC_BUNDLE_DATE=$() SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN SENTRY_RELEASE=$SENTRY_RELEASE SENTRY_DIST=$SENTRY_DIST SENTRY_DSN=$SENTRY_DSN yarn build-web + EXPO_PUBLIC_BUNDLE_IDENTIFIER=$EXPO_PUBLIC_BUNDLE_IDENTIFIER EXPO_PUBLIC_BUNDLE_DATE=$() SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN SENTRY_DIST=$SENTRY_DIST SENTRY_DSN=$SENTRY_DSN yarn build-web # DEBUG RUN find ./bskyweb/static && find ./web-build/static diff --git a/src/env.ts b/src/env.ts index cfa71a198b..c7ef794090 100644 --- a/src/env.ts +++ b/src/env.ts @@ -63,12 +63,6 @@ export const CHAT_PROXY_DID: Did = */ export const SENTRY_DSN: string | undefined = process.env.SENTRY_DSN -/** - * Populates the `release` value on Sentry events. This is the version of the - * app specified in the package.json. - */ -export const SENTRY_RELEASE: string = process.env.SENTRY_RELEASE || 'dev' - /** * Populates the `dist` value on Sentry events. We use the full commit hash the * current bundle was made from. diff --git a/src/logger/sentry/setup/index.ts b/src/logger/sentry/setup/index.ts index db28f51799..ee8b6be078 100644 --- a/src/logger/sentry/setup/index.ts +++ b/src/logger/sentry/setup/index.ts @@ -13,7 +13,7 @@ import * as env from '#/env' * - `dev` * - `1.99.0` */ -const release = env.SENTRY_RELEASE || pkgJson.version +const release = pkgJson.version /** * The latest deployed commit hash diff --git a/webpack.config.js b/webpack.config.js index 9a238e5493..2eaf024c48 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -54,8 +54,8 @@ module.exports = async function (env, argv) { authToken: process.env.SENTRY_AUTH_TOKEN, release: { // env is undefined for Render.com builds, fall back - name: process.env.SENTRY_RELEASE || version, - dist: process.env.SENTRY_DIST, + name: version, + dist: process.env.SENTRY_DIST || 'dev', }, }), )