diff options
| -rw-r--r-- | .github/workflows/build-submit-android.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/build-submit-ios.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/bundle-deploy-eas-update.yml | 112 | ||||
| -rw-r--r-- | .github/workflows/pull-request-commit.yml | 35 |
4 files changed, 84 insertions, 87 deletions
diff --git a/.github/workflows/build-submit-android.yml b/.github/workflows/build-submit-android.yml index e6ce20b86..b039512d6 100644 --- a/.github/workflows/build-submit-android.yml +++ b/.github/workflows/build-submit-android.yml @@ -119,3 +119,15 @@ jobs: env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }} SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK + + - name: ⬇️ Restore Cache + id: get-base-commit + uses: actions/cache@v4 + if: ${{ inputs.profile == 'testflight' && github.ref == 'refs/heads/main' }} + with: + path: most-recent-testflight-commit.txt + key: most-recent-testflight-commit + + - name: ✏️ Write commit hash to cache + if: ${{ inputs.profile == 'testflight' && github.ref == 'refs/heads/main' }} + run: echo ${{ github.sha }} > most-recent-testflight-commit.txt diff --git a/.github/workflows/build-submit-ios.yml b/.github/workflows/build-submit-ios.yml index bfd067095..0256e9687 100644 --- a/.github/workflows/build-submit-ios.yml +++ b/.github/workflows/build-submit-ios.yml @@ -76,3 +76,15 @@ jobs: - name: 🚀 Deploy run: eas submit -p ios --non-interactive --path build.ipa + + - name: ⬇️ Restore Cache + id: get-base-commit + uses: actions/cache@v4 + if: ${{ inputs.profile == 'testflight' && github.ref == 'refs/heads/main' }} + with: + path: most-recent-testflight-commit.txt + key: most-recent-testflight-commit + + - name: ✏️ Write commit hash to cache + if: ${{ inputs.profile == 'testflight' && github.ref == 'refs/heads/main' }} + run: echo ${{ github.sha }} > most-recent-testflight-commit.txt diff --git a/.github/workflows/bundle-deploy-eas-update.yml b/.github/workflows/bundle-deploy-eas-update.yml index 3d4940467..192593b9b 100644 --- a/.github/workflows/bundle-deploy-eas-update.yml +++ b/.github/workflows/bundle-deploy-eas-update.yml @@ -26,7 +26,7 @@ jobs: group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-deploy cancel-in-progress: true outputs: - fingerprint-is-different: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different }} + changes-detected: ${{ steps.fingerprint.outputs.includes-changes }} steps: - name: Check for EXPO_TOKEN @@ -49,69 +49,22 @@ jobs: with: fetch-depth: 0 - - name: ⬇️ Get last successful deployment commit from the cache - id: get-base-commit - uses: actions/cache@v4 - with: - path: last-successful-commit-hash.txt - key: last-successful-deployment-commit-${{ github.ref_name }}-${{ github.sha }} - restore-keys: | - last-successful-deployment-commit-${{ github.ref_name }}- - - - name: Add the last successful deployment commit to the output - id: last-successful-commit - run: echo base-commit=$(cat last-successful-commit-hash.txt) >> "$GITHUB_OUTPUT" - - name: ⬇️ Fetch commits from base branch if: ${{ github.ref != 'refs/heads/main' }} run: git fetch origin main:main --depth 100 - # This should get the current production release's commit's hash to see if the update is compatible - - name: 🕵️ Get the base commit - id: base-commit - run: | - 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" - fi - - - name: ✓ Make sure we found a base commit - run: | - if [ -z "${{ steps.base-commit.outputs.base-commit }}" && ${{ inputs.channel == 'production' }} ]; then - echo "Could not find a base commit for this release. Exiting." - exit 1 - fi - - name: 🔧 Setup Node uses: actions/setup-node@v4 with: node-version-file: .nvmrc cache: yarn - - name: ⚙️ Install Dependencies - run: yarn install - - # Run the fingerprint - - name: 📷 Check fingerprint + - name: 📷 Check fingerprint and install dependencies id: fingerprint - uses: expo/expo-github-action/fingerprint@main + uses: bluesky-social/github-actions/fingerprint-native@main with: - previous-git-commit: ${{ steps.base-commit.outputs.base-commit }} - - - name: 👀 Debug fingerprint - id: fingerprint-debug - run: | - echo "previousGitCommit=${{ steps.fingerprint.outputs.previous-git-commit }} currentGitCommit=${{ steps.fingerprint.outputs.current-git-commit }}" - echo "isPreviousFingerprintEmpty=${{ steps.fingerprint.outputs.previous-fingerprint == '' }}" - - fingerprintDiff='$(echo "${{ steps.fingerprint.outputs.fingerprint-diff }}")' - - if [[ $fingerprintDiff =~ "bareRncliAutolinking" || $fingerprintDiff =~ "expoAutolinkingAndroid" || $fingerprintDiff =~ "expoAutolinkingIos" ]]; then - echo fingerprint-is-different="true" >> "$GITHUB_OUTPUT" - else - echo fingerprint-is-different="false" >> "$GITHUB_OUTPUT" - fi + profile: ${{ inputs.channel || 'testflight' }} + previous-commit-tag: ${{ inputs.runtimeVersion }} - name: Lint check run: yarn lint @@ -127,22 +80,22 @@ jobs: - name: 🔨 Setup EAS uses: expo/expo-github-action@v8 - if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}} + if: ${{ !steps.fingerprint.outputs.includes-changes }} with: expo-version: latest eas-version: latest token: ${{ secrets.EXPO_TOKEN }} - name: ⛏️ Setup Expo - if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}} + if: ${{ !steps.fingerprint.outputs.includes-changes }} run: yarn global add eas-cli-local-build-plugin - name: 🪛 Setup jq - if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}} + if: ${{ !steps.fingerprint.outputs.includes-changes }} uses: dcarbone/install-jq-action@v2 - name: ✏️ Write environment variables - if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}} + if: ${{ !steps.fingerprint.outputs.includes-changes }} run: | export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}' echo "${{ secrets.ENV_TOKEN }}" > .env @@ -151,19 +104,28 @@ jobs: echo "$json" > google-services.json - name: 🏗️ Create Bundle - if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}} + if: ${{ !steps.fingerprint.outputs.includes-changes }} run: EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export - name: 📦 Package Bundle and 🚀 Deploy - if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}} + if: ${{ !steps.fingerprint.outputs.includes-changes }} run: yarn use-build-number bash scripts/bundleUpdate.sh env: DENIS_API_KEY: ${{ secrets.DENIS_API_KEY }} RUNTIME_VERSION: ${{ inputs.runtimeVersion }} CHANNEL_NAME: ${{ inputs.channel || 'testflight' }} - - name: Save successful deployment commit hash - run: echo ${{ steps.fingerprint.outputs.current-git-commit }} > last-successful-commit-hash.txt + - name: ⬇️ Restore Cache + id: get-base-commit + uses: actions/cache@v4 + if: ${{ !steps.fingerprint.outputs.includes-changes }} + with: + path: most-recent-testflight-commit.txt + key: most-recent-testflight-commit + + - name: ✏️ Write commit hash to cache + if: ${{ !steps.fingerprint.outputs.includes-changes }} + run: echo ${{ github.sha }} > most-recent-testflight-commit.txt # GitHub actions are horrible so let's just copy paste this in buildIfNecessaryIOS: @@ -171,11 +133,11 @@ jobs: runs-on: macos-14 concurrency: group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-build-ios - cancel-in-progress: false + cancel-in-progress: true needs: [bundleDeploy] # Gotta check if its NOT '[]' because any md5 hash in the outputs is detected as a possible secret and won't be # available here - if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.fingerprint-is-different == 'true' }} + if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.changes-detected }} steps: - name: Check for EXPO_TOKEN run: > @@ -238,6 +200,18 @@ jobs: - name: 🚀 Deploy run: eas submit -p ios --non-interactive --path build.ipa + - name: ⬇️ Restore Cache + id: get-base-commit + uses: actions/cache@v4 + if: ${{ inputs.channel == 'testflight' }} + with: + path: most-recent-testflight-commit.txt + key: most-recent-testflight-commit + + - name: ✏️ Write commit hash to cache + if: ${{ inputs.channel == 'testflight' }} + run: echo ${{ github.sha }} > most-recent-testflight-commit.txt + buildIfNecessaryAndroid: name: Build and Submit Android runs-on: ubuntu-latest @@ -247,7 +221,7 @@ jobs: needs: [ bundleDeploy ] # Gotta check if its NOT '[]' because any md5 hash in the outputs is detected as a possible secret and won't be # available here - if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.fingerprint-is-different == 'true' }} + if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.changes-detected }} steps: - name: Check for EXPO_TOKEN @@ -325,3 +299,15 @@ jobs: env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }} SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK + + - name: ⬇️ Restore Cache + id: get-base-commit + uses: actions/cache@v4 + if: ${{ inputs.channel == 'testflight' }} + with: + path: most-recent-testflight-commit.txt + key: most-recent-testflight-commit + + - name: ✏️ Write commit hash to cache + if: ${{ inputs.channel == 'testflight' }} + run: echo ${{ github.sha }} > most-recent-testflight-commit.txt diff --git a/.github/workflows/pull-request-commit.yml b/.github/workflows/pull-request-commit.yml index 6c796fd7c..53e3cc998 100644 --- a/.github/workflows/pull-request-commit.yml +++ b/.github/workflows/pull-request-commit.yml @@ -1,7 +1,7 @@ # Credit for fingerprint action https://github.com/expo/expo # https://github.com/expo/expo/blob/main/.github/workflows/pr-labeler.yml --- -name: PR labeler +name: PR Tests on: push: @@ -21,7 +21,7 @@ permissions: jobs: webpack-analyzer: runs-on: ubuntu-22.04 - if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} + if: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.event_name == 'pull_request'}} steps: - name: ⬇️ Checkout uses: actions/checkout@v4 @@ -94,10 +94,9 @@ jobs: | ${{ steps.get-diff.outputs.base_file_string }} | ${{ steps.get-diff.outputs.pr_file_string }} | ${{ steps.get-diff.outputs.diff_file_string }} (${{ steps.get-diff.outputs.percent }}%) | --- - test-suite-fingerprint: + fingerprint-native: runs-on: ubuntu-22.04 - if: ${{ github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'push' }} - concurrency: fingerprint-${{ github.event_name != 'pull_request' && 'main' || github.run_id }} + if: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.event_name == 'pull_request'}} steps: - name: ⬇️ Checkout uses: actions/checkout@v4 @@ -114,35 +113,23 @@ jobs: node-version-file: .nvmrc cache: yarn - - name: ⚙️ Install Dependencies - run: yarn install - - - name: Get the base commit - id: base-commit - run: echo base-commit=$(git log -n 1 main --pretty=format:'%H') >> "$GITHUB_OUTPUT" - - - name: 📷 Check fingerprint + - name: 📷 Check fingerprint and install dependencies id: fingerprint - uses: expo/expo-github-action/fingerprint@main + uses: bluesky-social/github-actions/fingerprint-native@main with: - previous-git-commit: ${{ steps.base-commit.outputs.base-commit }} - - - name: 👀 Debug fingerprint - run: | - echo "previousGitCommit=${{ steps.fingerprint.outputs.previous-git-commit }} currentGitCommit=${{ steps.fingerprint.outputs.current-git-commit }}" - echo "isPreviousFingerprintEmpty=${{ steps.fingerprint.outputs.previous-fingerprint == '' }}" + profile: pull-request - name: 💬 Drop a comment uses: marocchino/sticky-pull-request-comment@v2 - if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff != '[]' }} + if: ${{ steps.fingerprint.outputs.includes-changes }} with: header: fingerprint-diff message: | - The Pull Request introduced fingerprint changes against the base commit: ${{ steps.fingerprint.outputs.previous-git-commit }} + The Pull Request introduced fingerprint changes against the base commit: <details><summary>Fingerprint diff</summary> ```json - ${{ steps.fingerprint.outputs.fingerprint-diff }} + ${{ steps.fingerprint.outputs.diff }} ``` </details> @@ -152,7 +139,7 @@ jobs: - name: 💬 Delete comment uses: marocchino/sticky-pull-request-comment@v2 - if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff == '[]' }} + if: ${{ !steps.fingerprint.outputs.includes-changes }} with: header: fingerprint-diff delete: true |