try running android builds in parallel

OpenTails · Nov 23, 2024 · 1285641 · 1285641
1 parent a425465
commit 1285641
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/actions/build_android/action.yml b/.github/actions/build_android/action.yml
@@ -28,6 +28,9 @@ inputs:
   sentry-dsn:
     description: 'The sentry dsn for sending error info'
     required: true
+  build-mode:
+    description: 'Build an APK or App Bundle'
+    default: 'apk'
 runs:
   using: "composite"
   steps:
@@ -44,6 +47,7 @@ runs:
       env:
         ANDROID_KEY_JKS: ${{ inputs.android-key-jks }}
     - name: Build APK
+      if: ${{ inputs.version }} == 'apk'
       shell: bash
       run: flutter build apk --split-debug-info=./symbols --obfuscate --build-number="$BUILD_NUMBER" --build-name="$VERSION" --dart-define=SENTRY_DSN="$SENTRY_DSN" --dart-define=cronetHttpNoPlay=true
       env:
@@ -55,6 +59,7 @@ runs:
         SENTRY_DSN: ${{ inputs.sentry-dsn }}
         #SENTRY_URL: ${{ inputs.sentry-url }}
     - name: Build AppBundle
+      if: ${{ inputs.version }} == 'bundle'
       shell: bash
       run: flutter build appbundle --split-debug-info=./symbols --obfuscate --build-number="$BUILD_NUMBER" --build-name="$VERSION"  --dart-define=SENTRY_DSN="$SENTRY_DSN"
       env:
@@ -71,9 +76,7 @@ runs:
       run: cd android && ./gradlew app:dependencies --configuration releaseCompileClasspath
     - uses: actions/upload-artifact@v4
       continue-on-error: true
-      if: runner.os == 'Linux'
+      if: runner.os == 'Linux' && ${{ inputs.version }} == 'apk'
       with:
         name: artifact-${{ runner.os }}
-        path: |
-          build/app/outputs/apk
-          build/app/outputs/bundle
+        path: build/app/outputs/apk
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,6 +15,11 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
+        include:
+          - os: ubuntu-latest
+            android_build: apk
+          - os: ubuntu-latest
+            android_build: bundle
     name: Build
     runs-on: ${{ matrix.os }}
     steps:
@@ -41,6 +46,7 @@ jobs:
           sentry-org: ${{ secrets.SENTRY_ORG }}
           sentry-project: ${{ secrets.SENTRY_PROJECT }}
           sentry-dsn: ${{ secrets.SENTRY_DSN }}
+          build-mode: ${{ matrix.os.android_build }}
           #sentry-url: ${{ secrets.SENTRY_URL }}
       - name: Build IOS / Upload Beta
         if: github.event_name == 'push'