From 790a9c4fadc631f8c70285c144f5c6fea28ebd26 Mon Sep 17 00:00:00 2001 From: Hailey Date: Mon, 6 May 2024 20:13:12 -0700 Subject: [PATCH] fix bad bool check in action (#3885) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix bad bool check in action * add `fetch-depth` so we can get the commit hash * `.env` should be in `.easignore` 🙃 --- .easignore | 3 +-- .github/workflows/build-submit-android.yml | 2 ++ .github/workflows/build-submit-ios.yml | 2 ++ .github/workflows/bundle-deploy-eas-update.yml | 8 ++++++-- src/lib/app-info.ts | 3 +-- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.easignore b/.easignore index 29fc4124b5..95d14f78b7 100644 --- a/.easignore +++ b/.easignore @@ -95,8 +95,7 @@ web-build/ /ios/ # environment variables -.env .env.* # Firebase (Android) Google services -# INCLUDED: google-services.json \ No newline at end of file +# INCLUDED: google-services.json diff --git a/.github/workflows/build-submit-android.yml b/.github/workflows/build-submit-android.yml index 1a52694ac1..e6ce20b86d 100644 --- a/.github/workflows/build-submit-android.yml +++ b/.github/workflows/build-submit-android.yml @@ -25,6 +25,8 @@ jobs: - name: ⬇️ Checkout uses: actions/checkout@v4 + with: + fetch-depth: 5 - name: 🔧 Setup Node uses: actions/setup-node@v4 diff --git a/.github/workflows/build-submit-ios.yml b/.github/workflows/build-submit-ios.yml index 2350e46ad9..bfd0670956 100644 --- a/.github/workflows/build-submit-ios.yml +++ b/.github/workflows/build-submit-ios.yml @@ -25,6 +25,8 @@ jobs: - name: ⬇️ Checkout uses: actions/checkout@v4 + with: + fetch-depth: 5 - name: 🔧 Setup Node uses: actions/setup-node@v4 diff --git a/.github/workflows/bundle-deploy-eas-update.yml b/.github/workflows/bundle-deploy-eas-update.yml index 0f3a632134..a4bbaa8d07 100644 --- a/.github/workflows/bundle-deploy-eas-update.yml +++ b/.github/workflows/bundle-deploy-eas-update.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest concurrency: group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-deploy - cancel-in-progress: true + cancel-in-progress: false outputs: fingerprint-is-different: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different }} @@ -68,7 +68,7 @@ jobs: - name: 🕵️ Get the base commit id: base-commit run: | - if [ -z "${{ inputs.channel == 'production' }}" ]; then + if [ ${{ inputs.channel == 'production' }} ]; then echo base-commit=$(git show-ref -s ${{ inputs.runtimeVersion }}) >> "$GITHUB_OUTPUT" else echo base-commit=${{ steps.last-successful-commit.base-commit }} >> "$GITHUB_OUTPUT" @@ -184,6 +184,8 @@ jobs: - name: ⬇️ Checkout uses: actions/checkout@v4 + with: + fetch-depth: 5 - name: 🔧 Setup Node uses: actions/setup-node@v4 @@ -255,6 +257,8 @@ jobs: - name: ⬇️ Checkout uses: actions/checkout@v4 + with: + fetch-depth: 5 - name: 🔧 Setup Node uses: actions/setup-node@v4 diff --git a/src/lib/app-info.ts b/src/lib/app-info.ts index 00b0d7ecaa..729881acae 100644 --- a/src/lib/app-info.ts +++ b/src/lib/app-info.ts @@ -6,8 +6,7 @@ export const IS_TESTFLIGHT = process.env.EXPO_PUBLIC_ENV === 'testflight' // This is 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. -export const BUNDLE_IDENTIFIER = - process.env.EXPO_PUBLIC_BUNDLE_IDENTIFIER ?? 'dev' +export const BUNDLE_IDENTIFIER = process.env.EXPO_PUBLIC_BUNDLE_IDENTIFIER ?? '' // This will always be in the format of YYMMDD, so that it always increases for each build. This should only be used // for Statsig reporting and shouldn't be used to identify a specific bundle.