From 6542242e762aee189ca81ea0dcc1977aa5edcd6e Mon Sep 17 00:00:00 2001
From: Eric Windmill <eric@ericwindmill.com>
Date: Thu, 21 Aug 2025 11:32:18 -0700
Subject: [PATCH] re-enable ios and android build CI

---
 .github/workflows/beta.yml          | 26 +++++++++++------------
 .github/workflows/build-android.yml | 30 ++++++++++++++++++++++++++
 .github/workflows/build-ios.yml     | 33 +++++++++++++++++++++++++++++
 .github/workflows/main.yml          | 28 ------------------------
 4 files changed, 76 insertions(+), 41 deletions(-)
 create mode 100644 .github/workflows/build-android.yml
 create mode 100644 .github/workflows/build-ios.yml

diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index 3112eee85..967722d4a 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -38,19 +38,19 @@ jobs:
   
   # Verify the Android add-to-app samples build and pass tests with the beta
   # channel.
-  # android-build:
-  #   runs-on: ubuntu-latest
-  #   if: github.repository == 'flutter/samples'
-  #   steps:
-  #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-  #     - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
-  #       with:
-  #         distribution: 'zulu'
-  #         java-version: '17'
-  #     - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
-  #       with:
-  #         channel: beta
-  #     - run: ./tool/android_ci_script.sh
+  android-build:
+    runs-on: ubuntu-latest
+    if: github.repository == 'flutter/samples'
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+      - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
+        with:
+          channel: beta
+      - run: ./tool/android_ci_script.sh
 
   # Verify the iOS add-to-app samples build and pass tests with the beta
   # channel.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
new file mode 100644
index 000000000..c1f0ea58e
--- /dev/null
+++ b/.github/workflows/build-android.yml
@@ -0,0 +1,30 @@
+name: Test Android Build
+
+# Declare default permissions as read only.
+permissions: read-all
+
+on:
+  push:
+    branches: [beta]
+  pull_request:
+    branches: [beta]
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: bash
+  
+jobs:
+  android-build:
+    runs-on: ubuntu-latest
+    if: github.repository == 'flutter/samples'
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+      - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
+        with:
+          channel: stable
+      - run: ./tool/android_ci_script.sh
\ No newline at end of file
diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
new file mode 100644
index 000000000..0ea482dc3
--- /dev/null
+++ b/.github/workflows/build-ios.yml
@@ -0,0 +1,33 @@
+name: Test iOS Build
+
+# Declare default permissions as read only.
+permissions: read-all
+
+on:
+  push:
+    branches: [beta]
+  pull_request:
+    branches: [beta]
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: bash
+  
+jobs:
+  ios-build:
+    name: Test flutter beta channel
+    runs-on: macos-latest
+    if: github.repository == 'flutter/samples'
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+      - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
+        with:
+          channel: beta
+      - run: ./tool/ios_ci_script.sh
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 48873321e..711a23fdf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,31 +36,3 @@ jobs:
         with:
           channel: ${{ matrix.flutter_version }}
       - run: flutter pub get && dart tool/ci_script.dart
-
-  # android-build:
-  #   runs-on: ubuntu-latest
-  #   if: github.repository == 'flutter/samples'
-  #   steps:
-  #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-  #     - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
-  #       with:
-  #         distribution: 'zulu'
-  #         java-version: '17'
-  #     - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
-  #       with:
-  #         channel: stable
-  #     - run: ./tool/android_ci_script.sh
-
-  # ios-build:
-  #   runs-on: macos-latest
-  #   if: github.repository == 'flutter/samples'
-  #   steps:
-  #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-  #     - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
-  #       with:
-  #         distribution: 'zulu'
-  #         java-version: '17'
-  #     - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
-  #       with:
-  #         channel: stable
-  #     - run: ./tool/ios_ci_script.sh