Fix failing tests (subosito#327)

* try to fix failing tests * continue on error * remove Flutter versions that aren't available natively for arm64 macOS * explicitly specify arch = x64 (`-a x64`) * fix order of args * remove redundant quotes * make `dry-run` also accept bools
penkzhou · Nov 28, 2024 · 1dbddb1 · 1dbddb1
1 parent ebc5065
commit 1dbddb1
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 31 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -54,16 +54,16 @@ jobs:
           echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }}
         shell: bash
       - run: dart --version
-        if: ${{ matrix.dry-run != 'true' }}
+        if: ${{ matrix.dry-run != true }}
         shell: bash
       - run: flutter --version
-        if: ${{ matrix.dry-run != 'true' }}
+        if: ${{ matrix.dry-run != true }}
         shell: bash
       - run: "! dart --version"
-        if: ${{ matrix.dry-run == 'true' }}
+        if: ${{ matrix.dry-run == true }}
         shell: bash
       - run: "! flutter --version"
-        if: ${{ matrix.dry-run == 'true' }}
+        if: ${{ matrix.dry-run == true }}
         shell: bash
 
   test_cache:
@@ -111,6 +111,9 @@ jobs:
   test_print_output:
     runs-on: macos-latest
 
+    # These calls to setup.sh sepcify the -t flag, which enables test mode.
+    #  Test mode uses hardcoded Flutter release manifests from test/ directory.
+
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
@@ -120,7 +123,7 @@ jobs:
         shell: bash
       - run: ./setup.sh -t -p                        | grep '3.7.7'
         shell: bash
-      - run: ./setup.sh -t -p                        | grep 'x64'
+      - run: ./setup.sh -t -p -a x64                 | grep 'x64'
         shell: bash
       - run: ./setup.sh -t -p stable                 | grep 'stable'
         shell: bash
@@ -132,13 +135,13 @@ jobs:
         shell: bash
       - run: ./setup.sh -t -p -n 3.3.1 stable        | grep '3.3.1'
         shell: bash
-      - run: ./setup.sh -t -p -n 2 stable            | grep '2.10.5'
+      - run: ./setup.sh -t -p -n 2 -a x64 stable     | grep '2.10.5'
         shell: bash
-      - run: ./setup.sh -t -p -n 2 beta              | grep '2.13.0-0.4.pre'
+      - run: ./setup.sh -t -p -n 2 -a x64 beta       | grep '2.13.0-0.4.pre'
         shell: bash
-      - run: ./setup.sh -t -p -n 2 any               | grep 'beta'
+      - run: ./setup.sh -t -p -n 2 -a x64 any        | grep 'beta'
         shell: bash
-      - run: ./setup.sh -t -p -n 2 any               | grep '2.13.0-0.4.pre'
+      - run: ./setup.sh -t -p -n 2 -a x64 any        | grep '2.13.0-0.4.pre'
         shell: bash
       - run: ./setup.sh -t -p -n 3 any               | grep 'beta'
         shell: bash
@@ -152,47 +155,45 @@ jobs:
         shell: bash
       - run: ./setup.sh -t -p -n any -a arm64 stable | grep 'arm64'
         shell: bash
-      - run: ./setup.sh -t -p -n 1 stable            | grep '1.22.6'
-        shell: bash
-      - run: ./setup.sh -t -p -n 0 any               | grep 'beta'
+      - run: ./setup.sh -t -p -n 1 -a x64 stable     | grep '1.22.6'
         shell: bash
-      - run: ./setup.sh -t -p -n 0 any               | grep '0.11.13'
+      - run: ./setup.sh -t -p -n 0 -a x64 any        | grep 'beta'
         shell: bash
-      - run: ./setup.sh -t -p                        | grep 'flutter-macos-stable-3.7.7-x64-2ad6cd72c040113b47ee9055e722606a490ef0da'
+      - run: ./setup.sh -t -p -n 0 -a x64 any        | grep '0.11.13'
         shell: bash
-      - run: ./setup.sh -t -p stable                 | grep 'flutter-macos-stable-3.7.7-x64-2ad6cd72c040113b47ee9055e722606a490ef0da'
+      - run: ./setup.sh -t -p -a x64                 | grep 'flutter-macos-stable-3.7.7-x64-2ad6cd72c040113b47ee9055e722606a490ef0da'
         shell: bash
-      - run: ./setup.sh -t -p beta                   | grep 'flutter-macos-beta-3.9.0-0.1.pre-x64-f732038a8cf4562ce38a1d7debb30209ae3da896'
+      - run: ./setup.sh -t -p -a x64 stable          | grep 'flutter-macos-stable-3.7.7-x64-2ad6cd72c040113b47ee9055e722606a490ef0da'
         shell: bash
-      - run: ./setup.sh -t -p dev                    | grep 'flutter-macos-dev-2.11.0-0.1.pre-x64-b101bfe32f634566e7cb2791a9efe19cf8828b15'
+      - run: ./setup.sh -t -p -a x64 beta            | grep 'flutter-macos-beta-3.9.0-0.1.pre-x64-f732038a8cf4562ce38a1d7debb30209ae3da896'
         shell: bash
-      - run: ./setup.sh -t -p master                 | grep 'flutter-macos-master-any-x64-master'
+      - run: ./setup.sh -t -p -a x64 dev             | grep 'flutter-macos-dev-2.11.0-0.1.pre-x64-b101bfe32f634566e7cb2791a9efe19cf8828b15'
         shell: bash
-      - run: ./setup.sh -t -p -n 5b12b74 master      | grep 'flutter-macos-master-5b12b74-x64-master'
+      - run: ./setup.sh -t -p -a x64 master          | grep 'flutter-macos-master-any-x64-master'
         shell: bash
-      - run: ./setup.sh -t -p -n 3.12.0-12.0.pre master     | grep 'flutter-macos-master-3.12.0-12.0.pre-x64-master'
+      - run: ./setup.sh -t -p -n 5b12b74 -a x64 master | grep 'flutter-macos-master-5b12b74-x64-master'
         shell: bash
-      - run: ./setup.sh -t -p -n stable master       | grep 'flutter-macos-master-stable-x64-master'
+      - run: ./setup.sh -t -p -n 3.12.0-12.0.pre -a x64 master | grep 'flutter-macos-master-3.12.0-12.0.pre-x64-master'
         shell: bash
-      - run: ./setup.sh -t -p -n 2 any               | grep 'flutter-macos-beta-2.13.0-0.4.pre-x64-25caf1461b8f643092a9f6f5b224453b5c057d10'
+      - run: ./setup.sh -t -p -n 2 -a x64 any        | grep 'flutter-macos-beta-2.13.0-0.4.pre-x64-25caf1461b8f643092a9f6f5b224453b5c057d10'
         shell: bash
-      - run: ./setup.sh -t -p -n 1 any               | grep 'flutter-macos-beta-1.26.0-17.8.pre-x64-044f2cf5607a26f8818dab0f766400e85c52bdff'
+      - run: ./setup.sh -t -p -n 1 -a x64 any        | grep 'flutter-macos-beta-1.26.0-17.8.pre-x64-044f2cf5607a26f8818dab0f766400e85c52bdff'
         shell: bash
-      - run: ./setup.sh -t -p -n 0 any               | grep 'flutter-macos-beta-0.11.13-x64-58c8489fcdb4e4ef6c010117584c9b23d15221aa'
+      - run: ./setup.sh -t -p -n 0 -a x64 any        | grep 'flutter-macos-beta-0.11.13-x64-58c8489fcdb4e4ef6c010117584c9b23d15221aa'
         shell: bash
-      - run: ./setup.sh -t -p                        | grep '/Users/runner/hostedtoolcache/flutter/stable-3.7.7-x64'
+      - run: ./setup.sh -t -p -a x64                 | grep '/Users/runner/hostedtoolcache/flutter/stable-3.7.7-x64'
         shell: bash
-      - run: ./setup.sh -t -p stable                 | grep '/Users/runner/hostedtoolcache/flutter/stable-3.7.7-x64'
+      - run: ./setup.sh -t -p -a x64 stable          | grep '/Users/runner/hostedtoolcache/flutter/stable-3.7.7-x64'
         shell: bash
-      - run: ./setup.sh -t -p beta                   | grep '/Users/runner/hostedtoolcache/flutter/beta-3.9.0-0.1.pre-x64'
+      - run: ./setup.sh -t -p -a x64 beta            | grep '/Users/runner/hostedtoolcache/flutter/beta-3.9.0-0.1.pre-x64'
         shell: bash
-      - run: ./setup.sh -t -p dev                    | grep '/Users/runner/hostedtoolcache/flutter/dev-2.11.0-0.1.pre-x64'
+      - run: ./setup.sh -t -p -a x64 dev             | grep '/Users/runner/hostedtoolcache/flutter/dev-2.11.0-0.1.pre-x64'
         shell: bash
-      - run: ./setup.sh -t -p master                 | grep '/Users/runner/hostedtoolcache/flutter/master-any-x64'
+      - run: ./setup.sh -t -p -a x64 master          | grep '/Users/runner/hostedtoolcache/flutter/master-any-x64'
         shell: bash
       - run: ./setup.sh -t -p -k 'custom-:channel:-:version:-:hash:'       | grep 'custom-stable-3.7.7-2ad6cd72c040113b47ee9055e722606a490ef0da'
         shell: bash
-      - run: ./setup.sh -t -p -k 'custom-:channel:-:version:-:sha256:'     | grep 'custom-stable-3.7.7-78957b52f023a0d811add27eddc59b1a59d27d2ada5df123f39d0315708fb2d5'
+      - run: ./setup.sh -t -p -k 'custom-:channel:-:version:-:sha256:' -a x64 | grep 'custom-stable-3.7.7-78957b52f023a0d811add27eddc59b1a59d27d2ada5df123f39d0315708fb2d5'
         shell: bash
       - run: ./setup.sh -t -p -c '/tmp/flutter/:channel:-:version:-:hash:' | grep '/tmp/flutter/stable-3.7.7-2ad6cd72c040113b47ee9055e722606a490ef0da'
         shell: bash
diff --git a/action.yaml b/action.yaml
@@ -120,7 +120,7 @@ runs:
 
     - name: Run setup script
       shell: bash
-      if: ${{ inputs.dry-run != 'true' }}
+      if: ${{ inputs.dry-run != 'true' && inputs.dry-run != true }}
       run: |
         $GITHUB_ACTION_PATH/setup.sh \
           -n '${{ steps.flutter-action.outputs.VERSION }}' \