From c79e2102ad63b1e0acfbe97c8c6ec2b948483a96 Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Mon, 30 Oct 2023 11:00:32 -0400
Subject: [PATCH 01/15] chore: run integ tests on beta

---
 .github/workflows/e2e_ios.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/e2e_ios.yaml b/.github/workflows/e2e_ios.yaml
index 49ca68cf47..7907b247c9 100644
--- a/.github/workflows/e2e_ios.yaml
+++ b/.github/workflows/e2e_ios.yaml
@@ -18,6 +18,17 @@ on:
 jobs:
   e2e-test-ios:
     runs-on: macos-latest-xl
+    strategy:
+      # Allows other matrix items to run if one fails
+      fail-fast: false
+      matrix:
+        channel:
+          - "beta"
+          - "stable"
+        # Skips 'beta' tests on PRs
+        # exclude:
+        #   - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
       id-token: write

From b8660a753ec152d7b0afe71467095d271683d14f Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Tue, 31 Oct 2023 11:53:26 -0400
Subject: [PATCH 02/15] chore: pass channel to install dependencies

---
 .github/workflows/e2e_ios.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/e2e_ios.yaml b/.github/workflows/e2e_ios.yaml
index 7907b247c9..19ecb0343c 100644
--- a/.github/workflows/e2e_ios.yaml
+++ b/.github/workflows/e2e_ios.yaml
@@ -41,6 +41,8 @@ jobs:
 
       - name: Install dependencies
         uses: ./.github/composite_actions/install_dependencies
+        with:
+          channel: ${{ inputs.channel }}
 
       - name: Launch iOS simulator
         uses: ./.github/composite_actions/launch_ios_simulator

From 362fad7b19b9ba179aca1210994ea3b271a8f03b Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Tue, 31 Oct 2023 12:09:27 -0400
Subject: [PATCH 03/15] chore: update input to use correct param

---
 .github/workflows/e2e_ios.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e_ios.yaml b/.github/workflows/e2e_ios.yaml
index 19ecb0343c..2e2da5179e 100644
--- a/.github/workflows/e2e_ios.yaml
+++ b/.github/workflows/e2e_ios.yaml
@@ -42,7 +42,7 @@ jobs:
       - name: Install dependencies
         uses: ./.github/composite_actions/install_dependencies
         with:
-          channel: ${{ inputs.channel }}
+          channel: ${{ matrix.channel }}
 
       - name: Launch iOS simulator
         uses: ./.github/composite_actions/launch_ios_simulator

From fe1b0b43fef97bd89a34f7ae618254012f70de3e Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Tue, 31 Oct 2023 12:59:58 -0400
Subject: [PATCH 04/15] chore: update all platforms

---
 .github/workflows/e2e_android.yaml |  9 +++++++++
 .github/workflows/e2e_linux.yaml   | 13 +++++++++++++
 .github/workflows/e2e_web.yaml     | 13 +++++++++++++
 .github/workflows/e2e_windows.yaml | 13 +++++++++++++
 4 files changed, 48 insertions(+)

diff --git a/.github/workflows/e2e_android.yaml b/.github/workflows/e2e_android.yaml
index bf33f3774f..42b8c37bdb 100644
--- a/.github/workflows/e2e_android.yaml
+++ b/.github/workflows/e2e_android.yaml
@@ -29,6 +29,13 @@ jobs:
         api-level:
           - 24
           - 33
+        channel:
+          - "beta"
+          - "stable"
+        # Skips 'beta' tests on PRs
+        # exclude:
+        #   - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # 3.5.3
         with:
@@ -43,6 +50,8 @@ jobs:
 
       - name: Install dependencies
         uses: ./.github/composite_actions/install_dependencies
+        with:
+          channel: ${{ matrix.channel }}
 
       - name: Pub Upgrade
         run: aft exec --include=${{ inputs.package-name }} -- flutter pub upgrade
diff --git a/.github/workflows/e2e_linux.yaml b/.github/workflows/e2e_linux.yaml
index c884bbac7b..0abee1d070 100644
--- a/.github/workflows/e2e_linux.yaml
+++ b/.github/workflows/e2e_linux.yaml
@@ -19,6 +19,17 @@ jobs:
   e2e-test-linux:
     runs-on:
       labels: amplify-flutter_ubuntu-latest_4-core
+    strategy:
+      # Allows other matrix items to run if one fails
+      fail-fast: false
+      matrix:
+        channel:
+          - "beta"
+          - "stable"
+        # Skips 'beta' tests on PRs
+        # exclude:
+        #   - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
       id-token: write
@@ -31,6 +42,8 @@ jobs:
 
       - name: Install dependencies
         uses: ./.github/composite_actions/install_dependencies
+        with:
+          channel: ${{ matrix.channel }}
 
       - name: Pub Upgrade
         run: aft exec --include=${{ inputs.package-name }} -- flutter pub upgrade
diff --git a/.github/workflows/e2e_web.yaml b/.github/workflows/e2e_web.yaml
index 653739a03e..8ce055bcaf 100644
--- a/.github/workflows/e2e_web.yaml
+++ b/.github/workflows/e2e_web.yaml
@@ -19,6 +19,17 @@ jobs:
   e2e-test-web:
     runs-on:
       labels: amplify-flutter_ubuntu-latest_4-core
+    strategy:
+      # Allows other matrix items to run if one fails
+      fail-fast: false
+      matrix:
+        channel:
+          - "beta"
+          - "stable"
+        # Skips 'beta' tests on PRs
+        # exclude:
+        #   - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
       id-token: write
@@ -31,6 +42,8 @@ jobs:
 
       - name: Install dependencies
         uses: ./.github/composite_actions/install_dependencies
+        with:
+          channel: ${{ matrix.channel }}
 
       - name: Pub Upgrade
         run: aft exec --include=${{ inputs.package-name }} -- flutter pub upgrade
diff --git a/.github/workflows/e2e_windows.yaml b/.github/workflows/e2e_windows.yaml
index 5cf1afb21c..4f7f794741 100644
--- a/.github/workflows/e2e_windows.yaml
+++ b/.github/workflows/e2e_windows.yaml
@@ -19,6 +19,17 @@ jobs:
   e2e-test-windows:
     runs-on:
       labels: amplify-flutter_windows-latest_8-core
+    strategy:
+      # Allows other matrix items to run if one fails
+      fail-fast: false
+      matrix:
+        channel:
+          - "beta"
+          - "stable"
+        # Skips 'beta' tests on PRs
+        # exclude:
+        #   - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
       id-token: write
@@ -34,6 +45,8 @@ jobs:
 
       - name: Install dependencies
         uses: ./.github/composite_actions/install_dependencies
+        with:
+          channel: ${{ matrix.channel }}
 
       - name: Pub Upgrade
         run: dart pub global run aft exec --include=${{ inputs.package-name }} -- flutter pub upgrade

From 00bc15e8c961067dbeb5bb2401729c9317de33e3 Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Wed, 1 Nov 2023 10:50:43 -0400
Subject: [PATCH 05/15] chore: skip tests for beta on PRs

---
 .github/workflows/e2e_android.yaml | 4 ++--
 .github/workflows/e2e_ios.yaml     | 4 ++--
 .github/workflows/e2e_linux.yaml   | 4 ++--
 .github/workflows/e2e_web.yaml     | 4 ++--
 .github/workflows/e2e_windows.yaml | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/e2e_android.yaml b/.github/workflows/e2e_android.yaml
index 42b8c37bdb..130d6bc658 100644
--- a/.github/workflows/e2e_android.yaml
+++ b/.github/workflows/e2e_android.yaml
@@ -33,8 +33,8 @@ jobs:
           - "beta"
           - "stable"
         # Skips 'beta' tests on PRs
-        # exclude:
-        #   - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+        exclude:
+          - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
 
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # 3.5.3
diff --git a/.github/workflows/e2e_ios.yaml b/.github/workflows/e2e_ios.yaml
index 2e2da5179e..9689ccf75f 100644
--- a/.github/workflows/e2e_ios.yaml
+++ b/.github/workflows/e2e_ios.yaml
@@ -26,8 +26,8 @@ jobs:
           - "beta"
           - "stable"
         # Skips 'beta' tests on PRs
-        # exclude:
-        #   - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+        exclude:
+          - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_linux.yaml b/.github/workflows/e2e_linux.yaml
index 0abee1d070..bc5b66754f 100644
--- a/.github/workflows/e2e_linux.yaml
+++ b/.github/workflows/e2e_linux.yaml
@@ -27,8 +27,8 @@ jobs:
           - "beta"
           - "stable"
         # Skips 'beta' tests on PRs
-        # exclude:
-        #   - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+        exclude:
+          - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_web.yaml b/.github/workflows/e2e_web.yaml
index 8ce055bcaf..30375b00ec 100644
--- a/.github/workflows/e2e_web.yaml
+++ b/.github/workflows/e2e_web.yaml
@@ -27,8 +27,8 @@ jobs:
           - "beta"
           - "stable"
         # Skips 'beta' tests on PRs
-        # exclude:
-        #   - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+        exclude:
+          - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_windows.yaml b/.github/workflows/e2e_windows.yaml
index 4f7f794741..c9b0082a72 100644
--- a/.github/workflows/e2e_windows.yaml
+++ b/.github/workflows/e2e_windows.yaml
@@ -27,8 +27,8 @@ jobs:
           - "beta"
           - "stable"
         # Skips 'beta' tests on PRs
-        # exclude:
-        #   - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+        exclude:
+          - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

From d4f693184ac6b4de4e91448d79cc4fda70789202 Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Wed, 1 Nov 2023 12:17:15 -0400
Subject: [PATCH 06/15] chore: run auth tests against beta only

---
 .github/workflows/e2e_android.yaml | 9 +++++++--
 .github/workflows/e2e_ios.yaml     | 9 +++++++--
 .github/workflows/e2e_linux.yaml   | 6 ++++--
 .github/workflows/e2e_web.yaml     | 9 +++++++--
 .github/workflows/e2e_windows.yaml | 9 +++++++--
 5 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/e2e_android.yaml b/.github/workflows/e2e_android.yaml
index 130d6bc658..0ba4514856 100644
--- a/.github/workflows/e2e_android.yaml
+++ b/.github/workflows/e2e_android.yaml
@@ -19,6 +19,9 @@ jobs:
   e2e-test-android:
     runs-on:
       labels: amplify-flutter_ubuntu-latest_4-core
+    env:
+      IS_PR: ${{ github.event_name == 'pull_request' && inputs.package-name }}
+      IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
       id-token: write
@@ -32,9 +35,11 @@ jobs:
         channel:
           - "beta"
           - "stable"
-        # Skips 'beta' tests on PRs
+        # Skips tests against stable for auth packages, otherwise skips tests
+        # against beta for PRs, otherwise skips nothing.
+        # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+          - channel: ${{ ($IS_AUTH_PACKAGE && 'stable') || ($IS_PR && 'beta') || 'NONE' }}
 
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # 3.5.3
diff --git a/.github/workflows/e2e_ios.yaml b/.github/workflows/e2e_ios.yaml
index 9689ccf75f..cacce1ddb2 100644
--- a/.github/workflows/e2e_ios.yaml
+++ b/.github/workflows/e2e_ios.yaml
@@ -18,6 +18,9 @@ on:
 jobs:
   e2e-test-ios:
     runs-on: macos-latest-xl
+    env:
+      IS_PR: ${{ github.event_name == 'pull_request' && inputs.package-name }}
+      IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     strategy:
       # Allows other matrix items to run if one fails
       fail-fast: false
@@ -25,9 +28,11 @@ jobs:
         channel:
           - "beta"
           - "stable"
-        # Skips 'beta' tests on PRs
+        # Skips tests against stable for auth packages, otherwise skips tests
+        # against beta for PRs, otherwise skips nothing.
+        # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+          - channel: ${{ ($IS_AUTH_PACKAGE && 'stable') || ($IS_PR && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_linux.yaml b/.github/workflows/e2e_linux.yaml
index bc5b66754f..8cdb5823fc 100644
--- a/.github/workflows/e2e_linux.yaml
+++ b/.github/workflows/e2e_linux.yaml
@@ -26,9 +26,11 @@ jobs:
         channel:
           - "beta"
           - "stable"
-        # Skips 'beta' tests on PRs
+        # Skips tests against stable for auth packages, otherwise skips tests
+        # against beta for PRs, otherwise skips nothing.
+        # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+          - channel: ${{ ($IS_AUTH_PACKAGE && 'stable') || ($IS_PR && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_web.yaml b/.github/workflows/e2e_web.yaml
index 30375b00ec..2b7b1261d8 100644
--- a/.github/workflows/e2e_web.yaml
+++ b/.github/workflows/e2e_web.yaml
@@ -19,6 +19,9 @@ jobs:
   e2e-test-web:
     runs-on:
       labels: amplify-flutter_ubuntu-latest_4-core
+    env:
+      IS_PR: ${{ github.event_name == 'pull_request' && inputs.package-name }}
+      IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     strategy:
       # Allows other matrix items to run if one fails
       fail-fast: false
@@ -26,9 +29,11 @@ jobs:
         channel:
           - "beta"
           - "stable"
-        # Skips 'beta' tests on PRs
+        # Skips tests against stable for auth packages, otherwise skips tests
+        # against beta for PRs, otherwise skips nothing.
+        # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+          - channel: ${{ ($IS_AUTH_PACKAGE && 'stable') || ($IS_PR && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_windows.yaml b/.github/workflows/e2e_windows.yaml
index c9b0082a72..fb0998853c 100644
--- a/.github/workflows/e2e_windows.yaml
+++ b/.github/workflows/e2e_windows.yaml
@@ -19,6 +19,9 @@ jobs:
   e2e-test-windows:
     runs-on:
       labels: amplify-flutter_windows-latest_8-core
+    env:
+      IS_PR: ${{ github.event_name == 'pull_request' && inputs.package-name }}
+      IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     strategy:
       # Allows other matrix items to run if one fails
       fail-fast: false
@@ -26,9 +29,11 @@ jobs:
         channel:
           - "beta"
           - "stable"
-        # Skips 'beta' tests on PRs
+        # Skips tests against stable for auth packages, otherwise skips tests
+        # against beta for PRs, otherwise skips nothing.
+        # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}
+          - channel: ${{ ($IS_AUTH_PACKAGE && 'stable') || ($IS_PR && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

From 5a8f331702c93b78f98a1f7922010063ecb9f5be Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Wed, 1 Nov 2023 13:33:08 -0400
Subject: [PATCH 07/15] chore: fix env vars

---
 .github/workflows/e2e_android.yaml | 2 +-
 .github/workflows/e2e_ios.yaml     | 2 +-
 .github/workflows/e2e_linux.yaml   | 3 +++
 .github/workflows/e2e_web.yaml     | 2 +-
 .github/workflows/e2e_windows.yaml | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/e2e_android.yaml b/.github/workflows/e2e_android.yaml
index 0ba4514856..55ebabc7f2 100644
--- a/.github/workflows/e2e_android.yaml
+++ b/.github/workflows/e2e_android.yaml
@@ -20,7 +20,7 @@ jobs:
     runs-on:
       labels: amplify-flutter_ubuntu-latest_4-core
     env:
-      IS_PR: ${{ github.event_name == 'pull_request' && inputs.package-name }}
+      IS_PR: ${{ github.event_name == 'pull_request' }}
       IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_ios.yaml b/.github/workflows/e2e_ios.yaml
index cacce1ddb2..799393e326 100644
--- a/.github/workflows/e2e_ios.yaml
+++ b/.github/workflows/e2e_ios.yaml
@@ -19,7 +19,7 @@ jobs:
   e2e-test-ios:
     runs-on: macos-latest-xl
     env:
-      IS_PR: ${{ github.event_name == 'pull_request' && inputs.package-name }}
+      IS_PR: ${{ github.event_name == 'pull_request' }}
       IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     strategy:
       # Allows other matrix items to run if one fails
diff --git a/.github/workflows/e2e_linux.yaml b/.github/workflows/e2e_linux.yaml
index 8cdb5823fc..0042c91dd7 100644
--- a/.github/workflows/e2e_linux.yaml
+++ b/.github/workflows/e2e_linux.yaml
@@ -19,6 +19,9 @@ jobs:
   e2e-test-linux:
     runs-on:
       labels: amplify-flutter_ubuntu-latest_4-core
+    env:
+      IS_PR: ${{ github.event_name == 'pull_request' }}
+      IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     strategy:
       # Allows other matrix items to run if one fails
       fail-fast: false
diff --git a/.github/workflows/e2e_web.yaml b/.github/workflows/e2e_web.yaml
index 2b7b1261d8..b6d2730222 100644
--- a/.github/workflows/e2e_web.yaml
+++ b/.github/workflows/e2e_web.yaml
@@ -20,7 +20,7 @@ jobs:
     runs-on:
       labels: amplify-flutter_ubuntu-latest_4-core
     env:
-      IS_PR: ${{ github.event_name == 'pull_request' && inputs.package-name }}
+      IS_PR: ${{ github.event_name == 'pull_request' }}
       IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     strategy:
       # Allows other matrix items to run if one fails
diff --git a/.github/workflows/e2e_windows.yaml b/.github/workflows/e2e_windows.yaml
index fb0998853c..c4be9f60e5 100644
--- a/.github/workflows/e2e_windows.yaml
+++ b/.github/workflows/e2e_windows.yaml
@@ -20,7 +20,7 @@ jobs:
     runs-on:
       labels: amplify-flutter_windows-latest_8-core
     env:
-      IS_PR: ${{ github.event_name == 'pull_request' && inputs.package-name }}
+      IS_PR: ${{ github.event_name == 'pull_request' }}
       IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     strategy:
       # Allows other matrix items to run if one fails

From ba24c5c411c51481c9aff12078766c15273672f9 Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Wed, 1 Nov 2023 14:20:47 -0400
Subject: [PATCH 08/15] chore fix env usage

---
 .github/workflows/e2e_android.yaml | 2 +-
 .github/workflows/e2e_ios.yaml     | 2 +-
 .github/workflows/e2e_linux.yaml   | 2 +-
 .github/workflows/e2e_web.yaml     | 2 +-
 .github/workflows/e2e_windows.yaml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/e2e_android.yaml b/.github/workflows/e2e_android.yaml
index 55ebabc7f2..bcda8901e2 100644
--- a/.github/workflows/e2e_android.yaml
+++ b/.github/workflows/e2e_android.yaml
@@ -39,7 +39,7 @@ jobs:
         # against beta for PRs, otherwise skips nothing.
         # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ ($IS_AUTH_PACKAGE && 'stable') || ($IS_PR && 'beta') || 'NONE' }}
+          - channel: ${{ (env.IS_AUTH_PACKAGE && 'stable') || (env.IS_PR && 'beta') || 'NONE' }}
 
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # 3.5.3
diff --git a/.github/workflows/e2e_ios.yaml b/.github/workflows/e2e_ios.yaml
index 799393e326..3972ea752f 100644
--- a/.github/workflows/e2e_ios.yaml
+++ b/.github/workflows/e2e_ios.yaml
@@ -32,7 +32,7 @@ jobs:
         # against beta for PRs, otherwise skips nothing.
         # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ ($IS_AUTH_PACKAGE && 'stable') || ($IS_PR && 'beta') || 'NONE' }}
+          - channel: ${{ (env.IS_AUTH_PACKAGE && 'stable') || (env.IS_PR && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_linux.yaml b/.github/workflows/e2e_linux.yaml
index 0042c91dd7..7fc60677bd 100644
--- a/.github/workflows/e2e_linux.yaml
+++ b/.github/workflows/e2e_linux.yaml
@@ -33,7 +33,7 @@ jobs:
         # against beta for PRs, otherwise skips nothing.
         # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ ($IS_AUTH_PACKAGE && 'stable') || ($IS_PR && 'beta') || 'NONE' }}
+          - channel: ${{ (env.IS_AUTH_PACKAGE && 'stable') || (env.IS_PR && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_web.yaml b/.github/workflows/e2e_web.yaml
index b6d2730222..d17fac87d9 100644
--- a/.github/workflows/e2e_web.yaml
+++ b/.github/workflows/e2e_web.yaml
@@ -33,7 +33,7 @@ jobs:
         # against beta for PRs, otherwise skips nothing.
         # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ ($IS_AUTH_PACKAGE && 'stable') || ($IS_PR && 'beta') || 'NONE' }}
+          - channel: ${{ (env.IS_AUTH_PACKAGE && 'stable') || (env.IS_PR && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_windows.yaml b/.github/workflows/e2e_windows.yaml
index c4be9f60e5..2d9dfe1d5c 100644
--- a/.github/workflows/e2e_windows.yaml
+++ b/.github/workflows/e2e_windows.yaml
@@ -33,7 +33,7 @@ jobs:
         # against beta for PRs, otherwise skips nothing.
         # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ ($IS_AUTH_PACKAGE && 'stable') || ($IS_PR && 'beta') || 'NONE' }}
+          - channel: ${{ (env.IS_AUTH_PACKAGE && 'stable') || (env.IS_PR && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

From 160455b84b29c43557b6485d5300daa535a83d8c Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Wed, 1 Nov 2023 14:24:07 -0400
Subject: [PATCH 09/15] chore: run auth tests against stable

---
 .github/workflows/e2e_android.yaml | 7 +++----
 .github/workflows/e2e_ios.yaml     | 7 +++----
 .github/workflows/e2e_linux.yaml   | 7 +++----
 .github/workflows/e2e_web.yaml     | 7 +++----
 .github/workflows/e2e_windows.yaml | 7 +++----
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/e2e_android.yaml b/.github/workflows/e2e_android.yaml
index bcda8901e2..02214aa5ca 100644
--- a/.github/workflows/e2e_android.yaml
+++ b/.github/workflows/e2e_android.yaml
@@ -35,11 +35,10 @@ jobs:
         channel:
           - "beta"
           - "stable"
-        # Skips tests against stable for auth packages, otherwise skips tests
-        # against beta for PRs, otherwise skips nothing.
-        # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
+        # Skips e2e tests against beta on PRs, except for auth/authenticator
+        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (env.IS_AUTH_PACKAGE && 'stable') || (env.IS_PR && 'beta') || 'NONE' }}
+          - channel: ${{ (env.IS_PR && !env.IS_AUTH_PACKAGE && 'beta') || 'NONE' }}
 
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # 3.5.3
diff --git a/.github/workflows/e2e_ios.yaml b/.github/workflows/e2e_ios.yaml
index 3972ea752f..6c96fa4cb4 100644
--- a/.github/workflows/e2e_ios.yaml
+++ b/.github/workflows/e2e_ios.yaml
@@ -28,11 +28,10 @@ jobs:
         channel:
           - "beta"
           - "stable"
-        # Skips tests against stable for auth packages, otherwise skips tests
-        # against beta for PRs, otherwise skips nothing.
-        # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
+        # Skips e2e tests against beta on PRs, except for auth/authenticator
+        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (env.IS_AUTH_PACKAGE && 'stable') || (env.IS_PR && 'beta') || 'NONE' }}
+          - channel: ${{ (env.IS_PR && !env.IS_AUTH_PACKAGE && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_linux.yaml b/.github/workflows/e2e_linux.yaml
index 7fc60677bd..25da3a9400 100644
--- a/.github/workflows/e2e_linux.yaml
+++ b/.github/workflows/e2e_linux.yaml
@@ -29,11 +29,10 @@ jobs:
         channel:
           - "beta"
           - "stable"
-        # Skips tests against stable for auth packages, otherwise skips tests
-        # against beta for PRs, otherwise skips nothing.
-        # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
+        # Skips e2e tests against beta on PRs, except for auth/authenticator
+        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (env.IS_AUTH_PACKAGE && 'stable') || (env.IS_PR && 'beta') || 'NONE' }}
+          - channel: ${{ (env.IS_PR && !env.IS_AUTH_PACKAGE && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_web.yaml b/.github/workflows/e2e_web.yaml
index d17fac87d9..8f88155f90 100644
--- a/.github/workflows/e2e_web.yaml
+++ b/.github/workflows/e2e_web.yaml
@@ -29,11 +29,10 @@ jobs:
         channel:
           - "beta"
           - "stable"
-        # Skips tests against stable for auth packages, otherwise skips tests
-        # against beta for PRs, otherwise skips nothing.
-        # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
+        # Skips e2e tests against beta on PRs, except for auth/authenticator
+        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (env.IS_AUTH_PACKAGE && 'stable') || (env.IS_PR && 'beta') || 'NONE' }}
+          - channel: ${{ (env.IS_PR && !env.IS_AUTH_PACKAGE && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_windows.yaml b/.github/workflows/e2e_windows.yaml
index 2d9dfe1d5c..c6dc03630d 100644
--- a/.github/workflows/e2e_windows.yaml
+++ b/.github/workflows/e2e_windows.yaml
@@ -29,11 +29,10 @@ jobs:
         channel:
           - "beta"
           - "stable"
-        # Skips tests against stable for auth packages, otherwise skips tests
-        # against beta for PRs, otherwise skips nothing.
-        # Todo(Jordan-Nelson): Update tests to run against stable once flutter 3.16.0 becomes stable.
+        # Skips e2e tests against beta on PRs, except for auth/authenticator
+        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (env.IS_AUTH_PACKAGE && 'stable') || (env.IS_PR && 'beta') || 'NONE' }}
+          - channel: ${{ (env.IS_PR && !env.IS_AUTH_PACKAGE && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

From 63af29949ea821e9e0db188c48d32df82311e77b Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Wed, 1 Nov 2023 15:58:19 -0400
Subject: [PATCH 10/15] chore: test removing IS_AUTH_PACKAGE

---
 .github/workflows/e2e_ios.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e_ios.yaml b/.github/workflows/e2e_ios.yaml
index 6c96fa4cb4..92f908c903 100644
--- a/.github/workflows/e2e_ios.yaml
+++ b/.github/workflows/e2e_ios.yaml
@@ -20,7 +20,7 @@ jobs:
     runs-on: macos-latest-xl
     env:
       IS_PR: ${{ github.event_name == 'pull_request' }}
-      IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
+      # IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     strategy:
       # Allows other matrix items to run if one fails
       fail-fast: false
@@ -31,7 +31,8 @@ jobs:
         # Skips e2e tests against beta on PRs, except for auth/authenticator
         # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (env.IS_PR && !env.IS_AUTH_PACKAGE && 'beta') || 'NONE' }}
+          # - channel: ${{ (env.IS_PR && !env.IS_AUTH_PACKAGE && 'beta') || 'NONE' }}
+          - channel: ${{ (env.IS_PR && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

From 9a23eaf98075a76a2c0146070836a6677573bb55 Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Thu, 2 Nov 2023 09:50:44 -0400
Subject: [PATCH 11/15] chore: remove env vars for ios tests

---
 .github/workflows/e2e_ios.yaml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/e2e_ios.yaml b/.github/workflows/e2e_ios.yaml
index 92f908c903..0876d29edf 100644
--- a/.github/workflows/e2e_ios.yaml
+++ b/.github/workflows/e2e_ios.yaml
@@ -18,9 +18,6 @@ on:
 jobs:
   e2e-test-ios:
     runs-on: macos-latest-xl
-    env:
-      IS_PR: ${{ github.event_name == 'pull_request' }}
-      # IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     strategy:
       # Allows other matrix items to run if one fails
       fail-fast: false
@@ -31,8 +28,7 @@ jobs:
         # Skips e2e tests against beta on PRs, except for auth/authenticator
         # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
         exclude:
-          # - channel: ${{ (env.IS_PR && !env.IS_AUTH_PACKAGE && 'beta') || 'NONE' }}
-          - channel: ${{ (env.IS_PR && 'beta') || 'NONE' }}
+          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_test' && inputs.package-name != 'amplify_authenticator_test' && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

From 21cf0c00b72615f5305b3cd6d8b9d82501399635 Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Thu, 2 Nov 2023 11:01:44 -0400
Subject: [PATCH 12/15] chore: remove changes to non ios platforms

---
 .github/workflows/e2e_android.yaml | 10 ----------
 .github/workflows/e2e_linux.yaml   | 11 -----------
 .github/workflows/e2e_web.yaml     | 11 -----------
 .github/workflows/e2e_windows.yaml | 14 --------------
 4 files changed, 46 deletions(-)

diff --git a/.github/workflows/e2e_android.yaml b/.github/workflows/e2e_android.yaml
index 02214aa5ca..5e9bb06ca7 100644
--- a/.github/workflows/e2e_android.yaml
+++ b/.github/workflows/e2e_android.yaml
@@ -19,9 +19,6 @@ jobs:
   e2e-test-android:
     runs-on:
       labels: amplify-flutter_ubuntu-latest_4-core
-    env:
-      IS_PR: ${{ github.event_name == 'pull_request' }}
-      IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
       id-token: write
@@ -32,13 +29,6 @@ jobs:
         api-level:
           - 24
           - 33
-        channel:
-          - "beta"
-          - "stable"
-        # Skips e2e tests against beta on PRs, except for auth/authenticator
-        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
-        exclude:
-          - channel: ${{ (env.IS_PR && !env.IS_AUTH_PACKAGE && 'beta') || 'NONE' }}
 
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # 3.5.3
diff --git a/.github/workflows/e2e_linux.yaml b/.github/workflows/e2e_linux.yaml
index 25da3a9400..a31418db94 100644
--- a/.github/workflows/e2e_linux.yaml
+++ b/.github/workflows/e2e_linux.yaml
@@ -19,20 +19,9 @@ jobs:
   e2e-test-linux:
     runs-on:
       labels: amplify-flutter_ubuntu-latest_4-core
-    env:
-      IS_PR: ${{ github.event_name == 'pull_request' }}
-      IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     strategy:
       # Allows other matrix items to run if one fails
       fail-fast: false
-      matrix:
-        channel:
-          - "beta"
-          - "stable"
-        # Skips e2e tests against beta on PRs, except for auth/authenticator
-        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
-        exclude:
-          - channel: ${{ (env.IS_PR && !env.IS_AUTH_PACKAGE && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_web.yaml b/.github/workflows/e2e_web.yaml
index 8f88155f90..008b21a0b8 100644
--- a/.github/workflows/e2e_web.yaml
+++ b/.github/workflows/e2e_web.yaml
@@ -19,20 +19,9 @@ jobs:
   e2e-test-web:
     runs-on:
       labels: amplify-flutter_ubuntu-latest_4-core
-    env:
-      IS_PR: ${{ github.event_name == 'pull_request' }}
-      IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
     strategy:
       # Allows other matrix items to run if one fails
       fail-fast: false
-      matrix:
-        channel:
-          - "beta"
-          - "stable"
-        # Skips e2e tests against beta on PRs, except for auth/authenticator
-        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
-        exclude:
-          - channel: ${{ (env.IS_PR && !env.IS_AUTH_PACKAGE && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_windows.yaml b/.github/workflows/e2e_windows.yaml
index c6dc03630d..e20e2b5af9 100644
--- a/.github/workflows/e2e_windows.yaml
+++ b/.github/workflows/e2e_windows.yaml
@@ -19,20 +19,6 @@ jobs:
   e2e-test-windows:
     runs-on:
       labels: amplify-flutter_windows-latest_8-core
-    env:
-      IS_PR: ${{ github.event_name == 'pull_request' }}
-      IS_AUTH_PACKAGE: ${{ inputs.package-name == 'amplify_auth_cognito_test' || inputs.package-name == 'amplify_authenticator_test' }}
-    strategy:
-      # Allows other matrix items to run if one fails
-      fail-fast: false
-      matrix:
-        channel:
-          - "beta"
-          - "stable"
-        # Skips e2e tests against beta on PRs, except for auth/authenticator
-        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
-        exclude:
-          - channel: ${{ (env.IS_PR && !env.IS_AUTH_PACKAGE && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

From c16adaf6ec3f559d336542ee1e9518c9e55344a3 Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Thu, 2 Nov 2023 11:21:29 -0400
Subject: [PATCH 13/15] chore: fix package names

---
 .github/workflows/e2e_ios.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e_ios.yaml b/.github/workflows/e2e_ios.yaml
index 0876d29edf..db7ddf8f53 100644
--- a/.github/workflows/e2e_ios.yaml
+++ b/.github/workflows/e2e_ios.yaml
@@ -28,7 +28,7 @@ jobs:
         # Skips e2e tests against beta on PRs, except for auth/authenticator
         # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_test' && inputs.package-name != 'amplify_authenticator_test' && 'beta') || 'NONE' }}
+          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && inputs.package-name != 'amplify_authenticator_example' && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

From 9b705f04f5d1316fe4d5994b8cdeedd953de21e6 Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Thu, 2 Nov 2023 12:28:58 -0400
Subject: [PATCH 14/15] chore: update remaining platforms

---
 .github/workflows/e2e_android.yaml |  7 +++++++
 .github/workflows/e2e_linux.yaml   |  8 ++++++++
 .github/workflows/e2e_web.yaml     |  8 ++++++++
 .github/workflows/e2e_windows.yaml | 11 +++++++++++
 4 files changed, 34 insertions(+)

diff --git a/.github/workflows/e2e_android.yaml b/.github/workflows/e2e_android.yaml
index 5e9bb06ca7..c66846fcde 100644
--- a/.github/workflows/e2e_android.yaml
+++ b/.github/workflows/e2e_android.yaml
@@ -29,6 +29,13 @@ jobs:
         api-level:
           - 24
           - 33
+        channel:
+          - "beta"
+          - "stable"
+        # Skips e2e tests against beta on PRs, except for auth/authenticator
+        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
+        exclude:
+          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && inputs.package-name != 'amplify_authenticator_example' && 'beta') || 'NONE' }}
 
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # 3.5.3
diff --git a/.github/workflows/e2e_linux.yaml b/.github/workflows/e2e_linux.yaml
index a31418db94..2dbabbcdd1 100644
--- a/.github/workflows/e2e_linux.yaml
+++ b/.github/workflows/e2e_linux.yaml
@@ -22,6 +22,14 @@ jobs:
     strategy:
       # Allows other matrix items to run if one fails
       fail-fast: false
+      matrix:
+        channel:
+          - "beta"
+          - "stable"
+        # Skips e2e tests against beta on PRs, except for auth/authenticator
+        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
+        exclude:
+          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && inputs.package-name != 'amplify_authenticator_example' && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_web.yaml b/.github/workflows/e2e_web.yaml
index 008b21a0b8..9db0b640a0 100644
--- a/.github/workflows/e2e_web.yaml
+++ b/.github/workflows/e2e_web.yaml
@@ -22,6 +22,14 @@ jobs:
     strategy:
       # Allows other matrix items to run if one fails
       fail-fast: false
+      matrix:
+        channel:
+          - "beta"
+          - "stable"
+        # Skips e2e tests against beta on PRs, except for auth/authenticator
+        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
+        exclude:
+          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && inputs.package-name != 'amplify_authenticator_example' && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_windows.yaml b/.github/workflows/e2e_windows.yaml
index e20e2b5af9..0fad8bebc8 100644
--- a/.github/workflows/e2e_windows.yaml
+++ b/.github/workflows/e2e_windows.yaml
@@ -19,6 +19,17 @@ jobs:
   e2e-test-windows:
     runs-on:
       labels: amplify-flutter_windows-latest_8-core
+    strategy:
+      # Allows other matrix items to run if one fails
+      fail-fast: false
+      matrix:
+        channel:
+          - "beta"
+          - "stable"
+        # Skips e2e tests against beta on PRs, except for auth/authenticator
+        # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
+        exclude:
+          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && inputs.package-name != 'amplify_authenticator_example' && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:

From b9457dce1ccca94ba864d7675afb580058b894d7 Mon Sep 17 00:00:00 2001
From: Jordan Nelson <Jordanryannelson@gmail.com>
Date: Thu, 2 Nov 2023 17:25:00 -0400
Subject: [PATCH 15/15] chore: only run auth tests against beta

---
 .github/workflows/e2e_android.yaml | 8 ++++----
 .github/workflows/e2e_ios.yaml     | 8 ++++----
 .github/workflows/e2e_linux.yaml   | 8 ++++----
 .github/workflows/e2e_web.yaml     | 8 ++++----
 .github/workflows/e2e_windows.yaml | 8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/e2e_android.yaml b/.github/workflows/e2e_android.yaml
index c66846fcde..62db3fb03d 100644
--- a/.github/workflows/e2e_android.yaml
+++ b/.github/workflows/e2e_android.yaml
@@ -30,12 +30,12 @@ jobs:
           - 24
           - 33
         channel:
-          - "beta"
-          - "stable"
-        # Skips e2e tests against beta on PRs, except for auth/authenticator
+          - beta
+          - stable
+        # Skips e2e tests against beta on PRs, except for auth
         # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && inputs.package-name != 'amplify_authenticator_example' && 'beta') || 'NONE' }}
+          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && 'beta') || 'NONE' }}
 
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # 3.5.3
diff --git a/.github/workflows/e2e_ios.yaml b/.github/workflows/e2e_ios.yaml
index db7ddf8f53..4dd40f2824 100644
--- a/.github/workflows/e2e_ios.yaml
+++ b/.github/workflows/e2e_ios.yaml
@@ -23,12 +23,12 @@ jobs:
       fail-fast: false
       matrix:
         channel:
-          - "beta"
-          - "stable"
-        # Skips e2e tests against beta on PRs, except for auth/authenticator
+          - beta
+          - stable
+        # Skips e2e tests against beta on PRs, except for auth
         # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && inputs.package-name != 'amplify_authenticator_example' && 'beta') || 'NONE' }}
+          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_linux.yaml b/.github/workflows/e2e_linux.yaml
index 2dbabbcdd1..3273e3d54f 100644
--- a/.github/workflows/e2e_linux.yaml
+++ b/.github/workflows/e2e_linux.yaml
@@ -24,12 +24,12 @@ jobs:
       fail-fast: false
       matrix:
         channel:
-          - "beta"
-          - "stable"
-        # Skips e2e tests against beta on PRs, except for auth/authenticator
+          - beta
+          - stable
+        # Skips e2e tests against beta on PRs, except for auth
         # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && inputs.package-name != 'amplify_authenticator_example' && 'beta') || 'NONE' }}
+          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_web.yaml b/.github/workflows/e2e_web.yaml
index 9db0b640a0..497423c353 100644
--- a/.github/workflows/e2e_web.yaml
+++ b/.github/workflows/e2e_web.yaml
@@ -24,12 +24,12 @@ jobs:
       fail-fast: false
       matrix:
         channel:
-          - "beta"
-          - "stable"
-        # Skips e2e tests against beta on PRs, except for auth/authenticator
+          - beta
+          - stable
+        # Skips e2e tests against beta on PRs, except for auth
         # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && inputs.package-name != 'amplify_authenticator_example' && 'beta') || 'NONE' }}
+          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions:
diff --git a/.github/workflows/e2e_windows.yaml b/.github/workflows/e2e_windows.yaml
index 0fad8bebc8..7d0ccf3b1f 100644
--- a/.github/workflows/e2e_windows.yaml
+++ b/.github/workflows/e2e_windows.yaml
@@ -24,12 +24,12 @@ jobs:
       fail-fast: false
       matrix:
         channel:
-          - "beta"
-          - "stable"
-        # Skips e2e tests against beta on PRs, except for auth/authenticator
+          - beta
+          - stable
+        # Skips e2e tests against beta on PRs, except for auth
         # Todo(Jordan-Nelson): Update tests to skip beta for auth once flutter 3.16.0 becomes stable.
         exclude:
-          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && inputs.package-name != 'amplify_authenticator_example' && 'beta') || 'NONE' }}
+          - channel: ${{ (github.event_name == 'pull_request' && inputs.package-name != 'amplify_auth_cognito_example' && 'beta') || 'NONE' }}
 
     # These permissions are needed to interact with GitHub's OIDC Token endpoint.
     permissions: