Fix CI attempt 3 (#10538)

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

@@ -43,25 +43,20 @@ jobs:
       - name: 🪛 Setup jq
         uses: dcarbone/install-jq-action@v2
 
-      - name: 🔨 Setup EAS
+      - name: ⚙️ Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: 🔨 Setup Expo CLI
         uses: expo/expo-github-action@main
         with:
           expo-version: latest
-          eas-version: latest
-          packager: pnpm
           token: ${{ secrets.EXPO_TOKEN }}
 
-      - name: ⛏️ Setup EAS local builds
-        run: pnpm add -g eas-cli-local-build-plugin
-
       - uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: "17"
 
-      - name: ⚙️ Install dependencies
-        run: pnpm install --frozen-lockfile
-
       - name: 🔤 Compile translations
         run: pnpm intl:build 2>&1 | tee i18n.log
 
@@ -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
 
@@ -166,7 +161,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
 

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

@@ -43,20 +43,15 @@ jobs:
       - name: 🪛 Setup jq
         uses: dcarbone/install-jq-action@v2
 
-      - name: 🔨 Setup EAS
+      - name: ⚙️ Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: 🔨 Setup Expo CLI
         uses: expo/expo-github-action@main
         with:
           expo-version: latest
-          eas-version: latest
-          packager: pnpm
           token: ${{ secrets.EXPO_TOKEN }}
 
-      - name: ⛏️ Setup EAS local builds
-        run: pnpm add -g eas-cli-local-build-plugin
-
-      - 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: >

app.config.js

@@ -262,6 +262,7 @@ module.exports = function (_config) {
               deploymentTarget: '15.1',
               buildReactNativeFromSource: true,
               ccacheEnabled: IS_DEV,
+              cxxLanguageStandard: 'c++23',
               extraPods: [
                 {
                   name: 'MCEmojiPicker',

eas.json

@@ -1,6 +1,6 @@
 {
   "cli": {
-    "version": ">= 3.8.1",
+    "version": "^18.13.0",
     "promptToConfigurePushNotifications": false,
     "appVersionSource": "remote"
   },

package.json

@@ -267,6 +267,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",