diff --git a/.env.example b/.env.example index 907a9fecd6..8b19e7b7fc 100644 --- a/.env.example +++ b/.env.example @@ -1,7 +1,7 @@ # The env the app is running in e.g. development, testflight, production EXPO_PUBLIC_ENV=development -# This is the short commit hash that the current bundle was made from. +# This is the commit hash that the current bundle was made from. EXPO_PUBLIC_BUNDLE_IDENTIFIER= # Should be formatted YYMMDDHH so that it increases for each build. diff --git a/.github/workflows/build-and-push-bskyweb-aws.yaml b/.github/workflows/build-and-push-bskyweb-aws.yaml index 9b0ff81182..0698389777 100644 --- a/.github/workflows/build-and-push-bskyweb-aws.yaml +++ b/.github/workflows/build-and-push-bskyweb-aws.yaml @@ -46,7 +46,7 @@ jobs: - name: Set outputs id: vars run: | - echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + echo "sha_long=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - name: Build and push Docker image id: build-and-push @@ -61,6 +61,6 @@ jobs: cache-to: type=gha,mode=max build-args: | EXPO_PUBLIC_ENV=production - EXPO_PUBLIC_BUNDLE_IDENTIFIER=${{ steps.vars.outputs.sha_short }} + EXPO_PUBLIC_BUNDLE_IDENTIFIER=${{ steps.vars.outputs.sha_long }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }} diff --git a/.github/workflows/build-submit-android.yml b/.github/workflows/build-submit-android.yml index bae52b995e..fe719c6b37 100644 --- a/.github/workflows/build-submit-android.yml +++ b/.github/workflows/build-submit-android.yml @@ -67,7 +67,7 @@ jobs: run: | export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}' echo "${{ secrets.ENV_TOKEN }}" > .env - echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env + echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env @@ -76,7 +76,7 @@ jobs: - name: 🏗️ EAS Build run: > SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} - SENTRY_DIST=$(git rev-parse --short HEAD) + SENTRY_DIST=$(git rev-parse HEAD) yarn use-build-number-with-bump eas build -p android --profile ${{ inputs.profile || 'testflight-android' }} @@ -144,7 +144,7 @@ jobs: if: ${{ inputs.profile == 'production' }} run: > SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} - SENTRY_DIST=$(git rev-parse --short HEAD) + SENTRY_DIST=$(git rev-parse HEAD) yarn use-build-number-with-bump eas build -p android --profile production-apk diff --git a/.github/workflows/build-submit-ios.yml b/.github/workflows/build-submit-ios.yml index 0584f59a30..e7e1bcdff2 100644 --- a/.github/workflows/build-submit-ios.yml +++ b/.github/workflows/build-submit-ios.yml @@ -79,7 +79,7 @@ jobs: - name: ✏️ Write environment variables run: | echo "${{ secrets.ENV_TOKEN }}" > .env - echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env + echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env @@ -88,7 +88,7 @@ jobs: - name: 🏗️ EAS Build run: > SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} - SENTRY_DIST=$(git rev-parse --short HEAD) + SENTRY_DIST=$(git rev-parse HEAD) yarn use-build-number-with-bump eas build-p ios --profile ${{ inputs.profile || 'testflight' }} diff --git a/.github/workflows/bundle-deploy-eas-update.yml b/.github/workflows/bundle-deploy-eas-update.yml index f468f5a965..abbdd39487 100644 --- a/.github/workflows/bundle-deploy-eas-update.yml +++ b/.github/workflows/bundle-deploy-eas-update.yml @@ -107,7 +107,7 @@ jobs: run: | export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}' echo "${{ secrets.ENV_TOKEN }}" > .env - echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env + echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env @@ -118,7 +118,7 @@ jobs: if: ${{ !steps.fingerprint.outputs.includes-changes }} run: > SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} - SENTRY_DIST=$(git rev-parse --short HEAD) + SENTRY_DIST=$(git rev-parse HEAD) yarn export - name: 📦 Package Bundle and 🚀 Deploy @@ -208,7 +208,7 @@ jobs: - name: ✏️ Write environment variables run: | echo "${{ secrets.ENV_TOKEN }}" > .env - echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env + echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env @@ -217,7 +217,7 @@ jobs: - name: 🏗️ EAS Build run: > SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} - SENTRY_DIST=$(git rev-parse --short HEAD) + SENTRY_DIST=$(git rev-parse HEAD) yarn use-build-number-with-bump eas build -p ios --profile testflight @@ -293,7 +293,7 @@ jobs: run: | export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}' echo "${{ secrets.ENV_TOKEN }}" > .env - echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse --short HEAD)" >> .env + echo "EXPO_PUBLIC_BUNDLE_IDENTIFIER=$(git rev-parse HEAD)" >> .env echo "EXPO_PUBLIC_BUNDLE_DATE=$(date -u +"%y%m%d%H")" >> .env echo "EXPO_PUBLIC_SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env echo "EXPO_PUBLIC_BITDRIFT_API_KEY=${{ secrets.BITDRIFT_API_KEY }}" >> .env @@ -302,7 +302,7 @@ jobs: - name: 🏗️ EAS Build run: > SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} - SENTRY_DIST=$(git rev-parse --short HEAD) + SENTRY_DIST=$(git rev-parse HEAD) yarn use-build-number-with-bump eas build -p android --profile testflight-android diff --git a/src/env/common.ts b/src/env/common.ts index 0abfb2e307..f4a4d66391 100644 --- a/src/env/common.ts +++ b/src/env/common.ts @@ -28,7 +28,7 @@ export const IS_DEV = __DEV__ export const IS_INTERNAL = IS_DEV || IS_TESTFLIGHT /** - * The _short_ commit hash that the current bundle was made from. The user can + * The commit hash that the current bundle was made from. The user can * see the commit hash in the app's settings along with the other version info. * Useful for debugging/reporting. */