From 4879a1a461c604a3fa66a78cd0eea43453df9640 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Thu, 19 Dec 2024 11:27:16 +1100 Subject: [PATCH 1/5] master -> main Fixing CI breakage --- .github/workflows/flutter-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index e79dd5dff0..7e2b16c4b1 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - flutter_version: [stable, beta, master] + flutter_version: [stable, beta, main] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 From a739dad41963d718312d77b8bcf24125344c3cb0 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Thu, 19 Dec 2024 11:31:13 +1100 Subject: [PATCH 2/5] Drop `dart --version` --- .github/workflows/flutter-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index 7e2b16c4b1..278af531de 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - flutter_version: [stable, beta, main] + flutter_version: [stable, beta, master] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 @@ -34,6 +34,5 @@ jobs: - uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff with: channel: ${{ matrix.flutter_version }} - - run: dart --version - run: flutter --version - run: ./flutter_ci_script_${{ matrix.flutter_version }}.sh From 40f92bcc0f074552082b8462ed1b2d9467b7f566 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Thu, 19 Dec 2024 11:37:22 +1100 Subject: [PATCH 3/5] Also drop `flutter --version` --- .github/workflows/flutter-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index 278af531de..1b29afbbef 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -34,5 +34,4 @@ jobs: - uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff with: channel: ${{ matrix.flutter_version }} - - run: flutter --version - run: ./flutter_ci_script_${{ matrix.flutter_version }}.sh From fd0bfc909829c95f858b9b827108a7c20afb1b6f Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Thu, 19 Dec 2024 11:42:59 +1100 Subject: [PATCH 4/5] Drop `master`, it's b0rked --- .github/workflows/flutter-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index 1b29afbbef..dec741449d 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - flutter_version: [stable, beta, master] + flutter_version: [stable, beta] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 @@ -34,4 +34,6 @@ jobs: - uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff with: channel: ${{ matrix.flutter_version }} + - run: dart --version + - run: flutter --version - run: ./flutter_ci_script_${{ matrix.flutter_version }}.sh From 36b9b0d2ad27451ea349ef0086cefda4f561fb8e Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Thu, 19 Dec 2024 16:48:52 +1100 Subject: [PATCH 5/5] Drop `master`, it's b0rked --- .github/workflows/flutter-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index cec331c399..6e37e79b34 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -23,6 +23,7 @@ jobs: strategy: fail-fast: false matrix: + # Add master back once https://github.com/flutter/flutter/issues/160558 is fixed flutter_version: [stable, beta] os: [ubuntu-latest, macos-latest, windows-latest] steps: