Update build android

mybigday · Oct 15, 2024 · 85e9952 · 85e9952
1 parent e3be7fb
commit 85e9952
Showing 1 changed file with 29 additions and 83 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -66,105 +66,51 @@ jobs:
           cd ..
           xcodebuild -workspace ios/RNExternalDisplayExample.xcworkspace -scheme RNExternalDisplayExample -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build
 
-  test-ios-oldarch:
-    runs-on: macOS-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/[email protected]
-        with:
-          node-version: 18.x
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v4
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Cache pods
-        uses: actions/cache@v4
-        with:
-          path: |
-            packages/RNExternalDisplayExample/ios/Pods
-            packages/RNExternalDisplayExample/ios/build
-          key: ${{ runner.os }}-pods-oldarch-${{ hashFiles('**/RNExternalDisplayExample/ios/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pods-oldarch-
-      - name: Install deps
-        run: yarn
-      - name: Build RNExternalDisplayExample
-        env:
-          RCT_NEW_ARCH_ENABLED: 0
-        run: |
-          cd packages/RNExternalDisplayExample/ios
-          pod repo update
-          pod install
-          cd ..
-          xcodebuild -workspace ios/RNExternalDisplayExample.xcworkspace -scheme RNExternalDisplayExample -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build
-
-  test-android-newarch:
+  build-android:
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/[email protected]
+      # Checkout the code
+      - name: Checkout the code
+        uses: actions/checkout@v4
+
+      # Set up Node.js environment
+      - name: Set up Node.js
+        uses: actions/[email protected]
         with:
           node-version: 18.x
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v4
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install Java
+
+      # Install Java 17
+      - name: Set up Java 17
         uses: actions/setup-java@v4
         with:
-          distribution: zulu
-          java-version: 17
-      # - name: Setup Android Emulator
-      #   run: |
-      #     $ANDROID_HOME/tools/bin/sdkmanager --install emulator
-      #     $ANDROID_HOME/tools/bin/sdkmanager --install "system-images;android-28;google_apis;x86"
-      #     echo no | $ANDROID_HOME/tools/bin/avdmanager create avd --force -n Test -k "system-images;android-28;google_apis;x86"
-      #     $ANDROID_HOME/emulator/emulator -avd test -no-audio -no-window &
-      - name: Install deps
-        run: yarn
-      - name: Build RNExternalDisplayExample
-        run: |
-          cd packages/RNExternalDisplayExample/android
-          ./gradlew assemblerelease
+          distribution: 'temurin'
+          java-version: '17'
 
-  test-android-oldarch:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/[email protected]
-        with:
-          node-version: 18.x
+      # Cache Yarn dependencies to speed up the build
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
+
       - uses: actions/cache@v4
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
-      - name: Install Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 17
-      - name: Install deps
+
+      # Install dependencies
+      - name: Install dependencies
         run: yarn
-      - name: Build RNExternalDisplayExample
+
+      # Prebuild the Android folder for Expo
+      - name: Prebuild Android with Expo
+        working-directory: apps/external-display-example
         run: |
-          cd packages/RNExternalDisplayExample/android
-          sed -i 's/newArchEnabled=true/newArchEnabled=false/g' gradle.properties
-          ./gradlew assemblerelease
+          yarn expo prebuild --platform android
+
+      # Build the APK without running on a device
+      - name: Build Android APK
+        working-directory: apps/external-display-example/android
+        run: ./gradlew assembleRelease