From a293edd2c2895d3ab2baacffa84a70d2b1a796b6 Mon Sep 17 00:00:00 2001 From: Bartek Pacia Date: Wed, 21 Aug 2024 01:11:09 +0100 Subject: [PATCH 1/7] try to fix failing tests --- .github/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index a345dbd..9c0af85 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -29,7 +29,7 @@ jobs: operating-system: [ubuntu-latest, windows-latest, macos-latest, macos-13, macos-14] channel: [stable, beta, master] - dry-run: [true, false] + dry-run: ["true", "false"] include: - operating-system: ubuntu-latest channel: main From 3f46547bbc40165adc43a8f09891f19f9ca98640 Mon Sep 17 00:00:00 2001 From: Bartek Pacia Date: Wed, 21 Aug 2024 01:24:38 +0100 Subject: [PATCH 2/7] continue on error --- .github/workflows/workflow.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 9c0af85..ffcee61 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -110,6 +110,10 @@ jobs: test_print_output: runs-on: macos-latest + continue-on-error: true + + # 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 @@ -122,6 +126,7 @@ jobs: shell: bash - run: ./setup.sh -t -p | grep 'x64' shell: bash + continue-on-error: true - run: ./setup.sh -t -p stable | grep 'stable' shell: bash - run: ./setup.sh -t -p beta | grep 'beta' From 4382f1f22c18402375c96e312a5b4d5927c00dbb Mon Sep 17 00:00:00 2001 From: Bartek Pacia Date: Wed, 21 Aug 2024 01:39:57 +0100 Subject: [PATCH 3/7] remove Flutter versions that aren't available natively for arm64 macOS --- .github/workflows/workflow.yaml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index ffcee61..2a51ad4 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -124,9 +124,8 @@ 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 | grep 'arm64' shell: bash - continue-on-error: true - run: ./setup.sh -t -p stable | grep 'stable' shell: bash - run: ./setup.sh -t -p beta | grep 'beta' @@ -137,14 +136,6 @@ 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' - shell: bash - - run: ./setup.sh -t -p -n 2 beta | grep '2.13.0-0.4.pre' - shell: bash - - run: ./setup.sh -t -p -n 2 any | grep 'beta' - shell: bash - - run: ./setup.sh -t -p -n 2 any | grep '2.13.0-0.4.pre' - shell: bash - run: ./setup.sh -t -p -n 3 any | grep 'beta' shell: bash - run: ./setup.sh -t -p -n 3 any | grep '3.9.0-0.1.pre' From ee05c1b95d56b7420db32a6d30f4e59c5dc38cfe Mon Sep 17 00:00:00 2001 From: Bartek Pacia Date: Wed, 21 Aug 2024 01:51:55 +0100 Subject: [PATCH 4/7] explicitly specify arch = x64 (`-a x64`) --- .github/workflows/workflow.yaml | 48 +++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 2a51ad4..b51a826 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -124,7 +124,7 @@ jobs: shell: bash - run: ./setup.sh -t -p | grep '3.7.7' shell: bash - - run: ./setup.sh -t -p | grep 'arm64' + - run: ./setup.sh -t -p -a x64 | grep 'x64' shell: bash - run: ./setup.sh -t -p stable | grep 'stable' shell: bash @@ -136,6 +136,14 @@ 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 -a x64 | grep '2.10.5' + shell: bash + - run: ./setup.sh -t -p -n 2 beta -a x64 | grep '2.13.0-0.4.pre' + shell: bash + - run: ./setup.sh -t -p -n 2 any -a x64 | grep 'beta' + shell: bash + - run: ./setup.sh -t -p -n 2 any -a x64 | grep '2.13.0-0.4.pre' + shell: bash - run: ./setup.sh -t -p -n 3 any | grep 'beta' shell: bash - run: ./setup.sh -t -p -n 3 any | grep '3.9.0-0.1.pre' @@ -148,43 +156,43 @@ 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' + - run: ./setup.sh -t -p -n 1 stable -a x64 | grep '1.22.6' shell: bash - - run: ./setup.sh -t -p -n 0 any | grep 'beta' + - run: ./setup.sh -t -p -n 0 any -a x64 | grep 'beta' shell: bash - - run: ./setup.sh -t -p -n 0 any | grep '0.11.13' + - run: ./setup.sh -t -p -n 0 any -a x64 | grep '0.11.13' shell: bash - - run: ./setup.sh -t -p | 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 stable | grep 'flutter-macos-stable-3.7.7-x64-2ad6cd72c040113b47ee9055e722606a490ef0da' + - run: ./setup.sh -t -p stable -a x6 | 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 beta -a x64 | grep 'flutter-macos-beta-3.9.0-0.1.pre-x64-f732038a8cf4562ce38a1d7debb30209ae3da896' 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 dev -a x64 | grep 'flutter-macos-dev-2.11.0-0.1.pre-x64-b101bfe32f634566e7cb2791a9efe19cf8828b15' shell: bash - - run: ./setup.sh -t -p master | grep 'flutter-macos-master-any-x64-master' + - run: ./setup.sh -t -p master -a x64 | grep 'flutter-macos-master-any-x64-master' shell: bash - - run: ./setup.sh -t -p -n 5b12b74 master | grep 'flutter-macos-master-5b12b74-x64-master' + - run: ./setup.sh -t -p -n 5b12b74 master -a x64 | grep 'flutter-macos-master-5b12b74-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 3.12.0-12.0.pre master -a x64 | grep 'flutter-macos-master-3.12.0-12.0.pre-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 stable master -a x64 | grep 'flutter-macos-master-stable-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 any -a x64 | 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 any -a x64 | 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 any -a x64 | 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 stable -a x64 | 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 beta -a x64 | 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 dev -a x64 | 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 master -a x64 | 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 From 84aba0852db705da23e163252ea6742e1b8813cc Mon Sep 17 00:00:00 2001 From: Bartek Pacia Date: Wed, 21 Aug 2024 02:14:38 +0100 Subject: [PATCH 5/7] fix order of args --- .github/workflows/workflow.yaml | 45 +++++++++++++++------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index b51a826..881c0c3 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -110,7 +110,6 @@ jobs: test_print_output: runs-on: macos-latest - continue-on-error: true # These calls to setup.sh sepcify the -t flag, which enables test mode. # Test mode uses hardcoded Flutter release manifests from test/ directory. @@ -136,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 -a x64 | 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 -a x64 | 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 -a x64 | grep 'beta' + - run: ./setup.sh -t -p -n 2 -a x64 any | grep 'beta' shell: bash - - run: ./setup.sh -t -p -n 2 any -a x64 | 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 @@ -156,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 -a x64 | grep '1.22.6' + - run: ./setup.sh -t -p -n 1 -a x64 stable | grep '1.22.6' shell: bash - - run: ./setup.sh -t -p -n 0 any -a x64 | grep 'beta' + - run: ./setup.sh -t -p -n 0 -a x64 any | grep 'beta' shell: bash - - run: ./setup.sh -t -p -n 0 any -a x64 | grep '0.11.13' + - run: ./setup.sh -t -p -n 0 -a x64 any | grep '0.11.13' shell: bash - run: ./setup.sh -t -p -a x64 | grep 'flutter-macos-stable-3.7.7-x64-2ad6cd72c040113b47ee9055e722606a490ef0da' shell: bash - - run: ./setup.sh -t -p stable -a x6 | grep 'flutter-macos-stable-3.7.7-x64-2ad6cd72c040113b47ee9055e722606a490ef0da' + - run: ./setup.sh -t -p -a x64 stable | grep 'flutter-macos-stable-3.7.7-x64-2ad6cd72c040113b47ee9055e722606a490ef0da' shell: bash - - run: ./setup.sh -t -p beta -a x64 | grep 'flutter-macos-beta-3.9.0-0.1.pre-x64-f732038a8cf4562ce38a1d7debb30209ae3da896' + - 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 dev -a x64 | grep 'flutter-macos-dev-2.11.0-0.1.pre-x64-b101bfe32f634566e7cb2791a9efe19cf8828b15' + - 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 master -a x64 | grep 'flutter-macos-master-any-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 5b12b74 master -a x64 | grep 'flutter-macos-master-5b12b74-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 3.12.0-12.0.pre master -a x64 | grep 'flutter-macos-master-3.12.0-12.0.pre-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 stable master -a x64 | grep 'flutter-macos-master-stable-x64-master' + - 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 2 any -a x64 | grep 'flutter-macos-beta-2.13.0-0.4.pre-x64-25caf1461b8f643092a9f6f5b224453b5c057d10' + - 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 1 any -a x64 | grep 'flutter-macos-beta-1.26.0-17.8.pre-x64-044f2cf5607a26f8818dab0f766400e85c52bdff' - shell: bash - - run: ./setup.sh -t -p -n 0 any -a x64 | 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 -a x64 | grep '/Users/runner/hostedtoolcache/flutter/stable-3.7.7-x64' shell: bash - - run: ./setup.sh -t -p stable -a x64 | 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 -a x64 | 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 -a x64 | 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 -a x64 | 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 From a775a7ade2d46d0e7a9cd689c4573588f966ddf5 Mon Sep 17 00:00:00 2001 From: Bartek Pacia Date: Wed, 21 Aug 2024 02:35:38 +0100 Subject: [PATCH 6/7] remove redundant quotes --- .github/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 881c0c3..7b5929a 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -29,7 +29,7 @@ jobs: operating-system: [ubuntu-latest, windows-latest, macos-latest, macos-13, macos-14] channel: [stable, beta, master] - dry-run: ["true", "false"] + dry-run: [true, false] include: - operating-system: ubuntu-latest channel: main From bd9e149649c53c646be39d1aa1939138741c9a12 Mon Sep 17 00:00:00 2001 From: Bartek Pacia Date: Wed, 21 Aug 2024 02:40:43 +0100 Subject: [PATCH 7/7] make `dry-run` also accept bools --- .github/workflows/workflow.yaml | 8 ++++---- action.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 7b5929a..6a21a36 100644 --- 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: diff --git a/action.yaml b/action.yaml index 73774f4..bc5d07d 100644 --- a/action.yaml +++ b/action.yaml @@ -112,7 +112,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 }}' \