[pnpm] Fix CI attempt 5 (#10567)

.github/workflows/build-submit-android.yml

@@ -43,20 +43,15 @@ jobs:
       - name: 🪛 Setup jq
         uses: dcarbone/install-jq-action@v2
 
-      - name: ⛏️ Setup EAS CLI & local builds
+      - name: ⚙️ Install dependencies
-        # note: can't do it via expo-github-action because we need to set the allow-build flag
+        run: pnpm install --frozen-lockfile
-        run: pnpm -g --allow-build=dtrace-provider add eas-cli@latest eas-cli-local-build-plugin
 
       - name: 🔨 Setup Expo CLI
         uses: expo/expo-github-action@main
         with:
           expo-version: latest
-          packager: pnpm
           token: ${{ secrets.EXPO_TOKEN }}
 
-      - name: ⚙️ Install dependencies
-        run: pnpm install --frozen-lockfile
-
       - uses: actions/setup-java@v5
         with:
           distribution: "temurin"
@@ -92,7 +87,7 @@ jobs:
           SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
           SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
           pnpm use-build-number-with-bump
-          eas build -p android
+          pnpm eas build -p android
           --profile $PROFILE
           --local --output build.aab --non-interactive
 
@@ -138,7 +133,7 @@ jobs:
           webhook-type: incoming-webhook
           payload-templated: true
           payload: |
-            text: Android production build for Google Play Store submission is ready!\n```Artifact: ${{ steps.upload-artifact-production.outputs.artifact-url }}\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_ANDROID_VERSION_CODE }}```
+            {"text": "Android production build for Google Play Store submission is ready!\n```Artifact: ${{ steps.upload-artifact-production.outputs.artifact-url }}\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_ANDROID_VERSION_CODE }}```"}
 
       - name: 🔔 Notify Slack of Testflight Build
         if: ${{ inputs.profile != 'production' }}
@@ -148,7 +143,7 @@ jobs:
           webhook-type: incoming-webhook
           payload-templated: true
           payload: |
-            text: Android build is ready for testing. Download the artifact here: ${{ steps.upload-artifact-testflight.outputs.artifact-url }}
+            {"text": "Android build is ready for testing. Download the artifact here: ${{ steps.upload-artifact-testflight.outputs.artifact-url }}"}
 
       - name: 🧹 Clear Metro cache
         if: ${{ inputs.profile == 'production' }}
@@ -162,7 +157,7 @@ jobs:
           SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
           SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
           pnpm use-build-number-with-bump
-          eas build -p android
+          pnpm eas build -p android
           --profile production-apk
           --local --output build.apk --non-interactive
 
@@ -184,7 +179,7 @@ jobs:
           webhook-type: incoming-webhook
           payload-templated: true
           payload: |
-            text: Android production build for GitHub/Obtanium is ready!\n```Artifact: ${{ steps.upload-artifact-production-apk.outputs.artifact-url }}\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_ANDROID_VERSION_CODE }}```
+            {"text": "Android production build for GitHub/Obtanium is ready!\n```Artifact: ${{ steps.upload-artifact-production-apk.outputs.artifact-url }}\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_ANDROID_VERSION_CODE }}```"}
 
       - name: ⬇️ Restore Cache
         id: get-base-commit

.github/workflows/build-submit-ios.yml

@@ -43,20 +43,15 @@ jobs:
       - name: 🪛 Setup jq
         uses: dcarbone/install-jq-action@v2
 
-      - name: ⛏️ Setup EAS CLI & local builds
+      - name: ⚙️ Install dependencies
-        # note: can't do it via expo-github-action because we need to set the allow-build flag
+        run: pnpm install --frozen-lockfile
-        run: pnpm -g --allow-build=dtrace-provider add eas-cli@latest eas-cli-local-build-plugin
 
       - name: 🔨 Setup Expo CLI
         uses: expo/expo-github-action@main
         with:
           expo-version: latest
-          packager: pnpm
           token: ${{ secrets.EXPO_TOKEN }}
 
-      - name: ⚙️ Install dependencies
-        run: pnpm install --frozen-lockfile
-
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: "26.4"
@@ -104,7 +99,7 @@ jobs:
           SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
           SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
           pnpm use-build-number-with-bump
-          eas build -p ios
+          pnpm eas build -p ios
           --profile $PROFILE
           --local --output build.tar.gz --non-interactive
 
@@ -144,7 +139,7 @@ jobs:
           fi
 
       - name: 🚀 Deploy
-        run: eas submit -p ios --non-interactive --path "$BUILD_DIR/Bluesky.ipa"
+        run: pnpm eas submit -p ios --non-interactive --path "$BUILD_DIR/Bluesky.ipa"
 
       - name: 🪲 Upload dSYM to Sentry
         run: >
@@ -165,7 +160,7 @@ jobs:
           webhook-type: incoming-webhook
           payload-templated: true
           payload: |
-            text: iOS production build for App Store submission is ready!\n```Artifact: Check TestFlight to know when it is available\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_IOS_BUILD_NUMBER }}```
+            {"text": "iOS production build for App Store submission is ready!\n```Artifact: Check TestFlight to know when it is available\nVersion Number: ${{ steps.get-build-info.outputs.PACKAGE_VERSION }}\nBuild Number: ${{ steps.get-build-info.outputs.BSKY_IOS_BUILD_NUMBER }}```"}
 
       - name: ⬇️ Restore Cache
         id: get-base-commit

.github/workflows/bundle-deploy-eas-update.yml

@@ -86,23 +86,17 @@ jobs:
       - name: Type check
         run: pnpm typecheck
 
+      - name: 🔨 Setup EAS
+        uses: expo/expo-github-action@main
+        if: ${{ !steps.fingerprint.outputs.includes-changes }}
+        with:
+          expo-version: latest
+          token: ${{ secrets.EXPO_TOKEN }}
+
       - name: 🪛 Setup jq
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
         uses: dcarbone/install-jq-action@v2
 
-      - name: ⛏️ Setup EAS CLI & local builds
-        if: ${{ !steps.fingerprint.outputs.includes-changes }}
-        # note: can't do it via expo-github-action because we need to set the allow-build flag
-        run: pnpm -g --allow-build=dtrace-provider add eas-cli@latest eas-cli-local-build-plugin@latest
-
-      - name: 🔨 Setup Expo CLI
-        if: ${{ !steps.fingerprint.outputs.includes-changes }}
-        uses: expo/expo-github-action@main
-        with:
-          expo-version: latest
-          packager: pnpm
-          token: ${{ secrets.EXPO_TOKEN }}
-
       # eas.json not used here, set EXPO_PUBLIC_ENV
       - name: Env
         env:
@@ -184,17 +178,10 @@ jobs:
           node-version-file: .nvmrc
           cache: pnpm
 
-      - name: ⛏️ Setup EAS CLI & local builds
+      - name: 🔨 Setup EAS
-        if: ${{ !steps.fingerprint.outputs.includes-changes }}
-        # note: can't do it via expo-github-action because we need to set the allow-build flag
-        run: pnpm -g --allow-build=dtrace-provider add eas-cli@latest eas-cli-local-build-plugin
-
-      - name: 🔨 Setup Expo CLI
-        if: ${{ !steps.fingerprint.outputs.includes-changes }}
         uses: expo/expo-github-action@main
         with:
           expo-version: latest
-          packager: pnpm
           token: ${{ secrets.EXPO_TOKEN }}
 
       - name: ⚙️ Install dependencies
@@ -242,7 +229,7 @@ jobs:
           SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
           SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
           pnpm use-build-number-with-bump
-          eas build -p ios
+          pnpm eas build -p ios
           --profile testflight
           --local --output build.tar.gz --non-interactive
 
@@ -282,7 +269,7 @@ jobs:
           fi
 
       - name: 🚀 Deploy
-        run: eas submit -p ios --non-interactive --path "$BUILD_DIR/Bluesky.ipa"
+        run: pnpm eas submit -p ios --non-interactive --path "$BUILD_DIR/Bluesky.ipa"
 
       - name: 🪲 Upload dSYM to Sentry
         run: >
@@ -337,27 +324,20 @@ jobs:
           node-version-file: .nvmrc
           cache: pnpm
 
-      - name: ⛏️ Setup EAS CLI & local builds
+      - name: 🔨 Setup EAS
-        if: ${{ !steps.fingerprint.outputs.includes-changes }}
-        # note: can't do it via expo-github-action because we need to set the allow-build flag
-        run: pnpm -g --allow-build=dtrace-provider add eas-cli@latest eas-cli-local-build-plugin
-
-      - name: 🔨 Setup Expo CLI
-        if: ${{ !steps.fingerprint.outputs.includes-changes }}
         uses: expo/expo-github-action@main
         with:
           expo-version: latest
-          packager: pnpm
           token: ${{ secrets.EXPO_TOKEN }}
 
-      - name: ⚙️ Install dependencies
-        run: pnpm install --frozen-lockfile
-
       - uses: actions/setup-java@v5
         with:
           distribution: "temurin"
           java-version: "17"
 
+      - name: ⚙️ Install dependencies
+        run: pnpm install --frozen-lockfile
+
       - name: 🔤 Compile translations
         run: pnpm intl:build
 
@@ -383,7 +363,7 @@ jobs:
           SENTRY_RELEASE=${{ steps.env.outputs.EXPO_PUBLIC_RELEASE_VERSION }}
           SENTRY_DIST=${{ steps.env.outputs.EXPO_PUBLIC_BUNDLE_IDENTIFIER }}
           pnpm use-build-number-with-bump
-          eas build -p android
+          pnpm eas build -p android
           --profile testflight-android
           --local --output build.apk --non-interactive
 
@@ -409,7 +389,7 @@ jobs:
           webhook-type: incoming-webhook
           payload-templated: true
           payload: |
-            text: Android build is ready for testing. Download the artifact here: ${{ steps.upload-artifact.outputs.artifact-url }}
+            {"text": "Android build is ready for testing. Download the artifact here: ${{ steps.upload-artifact.outputs.artifact-url }}"}
 
       - name: ⬇️ Restore Cache
         id: get-base-commit

.github/workflows/pull-request-comment.yml

@@ -140,15 +140,10 @@ jobs:
       - name: Type check
         run: pnpm typecheck
 
-      - name: ⛏️ Setup EAS CLI & local builds
+      - name: 🔨 Setup EAS
-        # note: can't do it via expo-github-action because we need to set the allow-build flag
-        run: pnpm -g --allow-build=dtrace-provider add eas-cli@latest eas-cli-local-build-plugin
-
-      - name: 🔨 Setup Expo CLI
         uses: expo/expo-github-action@main
         with:
           expo-version: latest
-          packager: pnpm
           token: ${{ secrets.EXPO_TOKEN }}
 
       - name: 🪛 Setup jq

package.json

@@ -272,6 +272,8 @@
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-plugin-react-compiler": "19.1.0-rc.3",
     "babel-preset-expo": "~54.0.10",
+    "eas-cli": "^18.13.0",
+    "eas-cli-local-build-plugin": "^18.12.3",
     "eslint": "^9.39.2",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-bsky-internal": "link:eslint",