Fix/auth/device migration android2

.github/composite_actions/log_cw_metric_wrapper/action.yaml

@@ -53,14 +53,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Exit if not scheduled
-      shell: bash
-      run: |
-        if [ "${{ github.event_name }}" != "schedule" ]; then
-          echo "This was not triggered by a schedule, skipping."
-          echo "SKIP_CW=true" >> $GITHUB_ENV
-        fi
-
     - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # 3.6.0
       if: env.SKIP_CW != 'true'
       with:
@@ -83,7 +75,7 @@ runs:
         job-status: ${{ inputs.job-status }}
         github-token: ${{ inputs.github-token }}
 
-        metric-name: "github_metric_2.0"
+        metric-name: "github_metric_2.1"
         test-type: ${{ inputs.test-type }}
         working-directory: ${{ inputs.working-directory }}
 

.github/workflows/dart_dart2js.yaml

@@ -82,5 +82,5 @@ jobs:
 
       - name: Run Tests
         if: "always() && steps.bootstrap.conclusion == 'success'"
-        run: dart run build_runner test --release --delete-conflicting-outputs -- -p ${{ matrix.browser }}
+        run: dart run build_runner build test --release --delete-conflicting-outputs && dart test -p ${{ matrix.browser }}
         working-directory: ${{ inputs.working-directory }}

.github/workflows/dart_ddc.yaml

@@ -82,7 +82,7 @@ jobs:
 
       - name: Run Tests
         if: "always() && steps.bootstrap.conclusion == 'success'"
-        run: dart run build_runner test --delete-conflicting-outputs -- -p ${{ matrix.browser }}
+        run: dart run build_runner build test --delete-conflicting-outputs && dart test -p ${{ matrix.browser }}
         working-directory: ${{ inputs.working-directory }}
 
       - name: Log success/failure

.github/workflows/e2e_android.yaml

@@ -29,6 +29,13 @@ jobs:
         api-level:
           - 24
           - 33
+        channel:
+          - beta
+          - stable
+        # Skips e2e tests against beta 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

.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 e2e tests against beta 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
@@ -30,6 +41,8 @@ jobs:
 
       - name: Install dependencies
         uses: ./.github/composite_actions/install_dependencies
+        with:
+          channel: ${{ matrix.channel }}
 
       - name: Launch iOS simulator
         uses: ./.github/composite_actions/launch_ios_simulator

.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 e2e tests against beta 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

.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 e2e tests against beta 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

.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
+        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