From 637f87918849ca4a55ede4a260804e5f52f489d7 Mon Sep 17 00:00:00 2001 From: Tino Date: Sun, 15 May 2022 22:29:42 +0800 Subject: [PATCH 1/6] Filter branch --- .github/workflows/main.yml | 21 ++++++++++++++++++--- .github/workflows/matrix_includes.json | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/matrix_includes.json diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3659b4..7ee8e19 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,10 +9,24 @@ on: pull_request: jobs: + + matrix_prep: + runs-on: ubuntu-latest + outputs: + matrix: ${{ steps.set-matrix.outputs.matrix }} + steps: + # Required as the JSON input file needs to be read + - uses: actions/checkout@v3 + - id: set-matrix + uses: JoshuaTheMiller/conditional-build-matrix@main + with: + # inputFile: '.github/workflows/matrix_includes.json' # Default input file path + filter: '[?runOnBranch==`${{ github.ref }}` || runOnBranch==`always`]' + addInclude: false + # Set up Flutter for all other tasks. setup: - runs-on: ${{ matrix.os }} - + needs: matrix_prep strategy: matrix: os: [macos-latest, ubuntu-latest, windows-latest] @@ -24,6 +38,7 @@ jobs: - os: windows-latest flutter_path: C:\Users\runneradmin\hostedtoolcache\flutter fail-fast: false + runs-on: ${{ matrix.runs_on }} steps: - uses: actions/checkout@v3 @@ -37,7 +52,6 @@ jobs: channel: 'stable' build-and-test: - runs-on: ${{ matrix.os }} needs: setup strategy: @@ -51,6 +65,7 @@ jobs: - os: windows-latest flutter_path: C:\Users\runneradmin\hostedtoolcache\flutter fail-fast: false + runs-on: ${{ matrix.runs_on }} steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/matrix_includes.json b/.github/workflows/matrix_includes.json new file mode 100644 index 0000000..fe117c6 --- /dev/null +++ b/.github/workflows/matrix_includes.json @@ -0,0 +1,14 @@ +[ + { + "runs_on":"ubuntu-latest", + "runOnBranch":"always" + }, + { + "runs_on":"windows-latest", + "runOnBranch":"master" + }, + { + "runs_on":"macos-latest", + "runOnBranch":"master" + } +] \ No newline at end of file From 06c363c3d017698dbd9865da36bc2c90149f9197 Mon Sep 17 00:00:00 2001 From: Tino Date: Sun, 15 May 2022 22:33:21 +0800 Subject: [PATCH 2/6] update --- .github/workflows/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7ee8e19..e4700b5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,6 +27,7 @@ jobs: # Set up Flutter for all other tasks. setup: needs: matrix_prep + runs-on: ${{ matrix.runs_on }} strategy: matrix: os: [macos-latest, ubuntu-latest, windows-latest] @@ -38,7 +39,6 @@ jobs: - os: windows-latest flutter_path: C:\Users\runneradmin\hostedtoolcache\flutter fail-fast: false - runs-on: ${{ matrix.runs_on }} steps: - uses: actions/checkout@v3 @@ -53,7 +53,7 @@ jobs: build-and-test: needs: setup - + runs-on: ${{ matrix.runs_on }} strategy: matrix: os: [macos-latest, ubuntu-latest, windows-latest] @@ -65,7 +65,6 @@ jobs: - os: windows-latest flutter_path: C:\Users\runneradmin\hostedtoolcache\flutter fail-fast: false - runs-on: ${{ matrix.runs_on }} steps: - uses: actions/checkout@v3 From ae1ff4f7806098dd9293e24756f090abfcfa0296 Mon Sep 17 00:00:00 2001 From: Tino Date: Sun, 15 May 2022 22:35:07 +0800 Subject: [PATCH 3/6] update --- .github/workflows/main.yml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e4700b5..221885e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,15 +29,7 @@ jobs: needs: matrix_prep runs-on: ${{ matrix.runs_on }} strategy: - matrix: - os: [macos-latest, ubuntu-latest, windows-latest] - include: - - os: ubuntu-latest - flutter_path: /opt/hostedtoolcache/flutter - - os: macos-latest - flutter_path: /Users/runner/hostedtoolcache/flutter - - os: windows-latest - flutter_path: C:\Users\runneradmin\hostedtoolcache\flutter + matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}} fail-fast: false steps: @@ -55,15 +47,7 @@ jobs: needs: setup runs-on: ${{ matrix.runs_on }} strategy: - matrix: - os: [macos-latest, ubuntu-latest, windows-latest] - include: - - os: ubuntu-latest - flutter_path: /opt/hostedtoolcache/flutter - - os: macos-latest - flutter_path: /Users/runner/hostedtoolcache/flutter - - os: windows-latest - flutter_path: C:\Users\runneradmin\hostedtoolcache\flutter + matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}} fail-fast: false steps: From e253d691051ed5d9b626abd31673975d1707a415 Mon Sep 17 00:00:00 2001 From: Tino Date: Sun, 15 May 2022 22:36:34 +0800 Subject: [PATCH 4/6] update --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 221885e..3288a58 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,6 +17,7 @@ jobs: steps: # Required as the JSON input file needs to be read - uses: actions/checkout@v3 + - uses: nelonoel/branch-name@v1.0.1 - id: set-matrix uses: JoshuaTheMiller/conditional-build-matrix@main with: From 207aff416c6403e73911831ebcd8aa7325a6d15a Mon Sep 17 00:00:00 2001 From: Tino Date: Sun, 15 May 2022 22:41:33 +0800 Subject: [PATCH 5/6] update --- .github/workflows/main.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3288a58..0e79914 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: nelonoel/branch-name@v1.0.1 - id: set-matrix - uses: JoshuaTheMiller/conditional-build-matrix@main + uses: JoshuaTheMiller/conditional-build-matrix@0.1.0 with: # inputFile: '.github/workflows/matrix_includes.json' # Default input file path filter: '[?runOnBranch==`${{ github.ref }}` || runOnBranch==`always`]' @@ -28,10 +28,9 @@ jobs: # Set up Flutter for all other tasks. setup: needs: matrix_prep - runs-on: ${{ matrix.runs_on }} strategy: matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}} - fail-fast: false + runs-on: ${{ matrix.runs_on }} steps: - uses: actions/checkout@v3 @@ -46,10 +45,10 @@ jobs: build-and-test: needs: setup - runs-on: ${{ matrix.runs_on }} strategy: - matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}} + matrix: ${{ fromJson(needs.matrix_prep.outputs.matrix) }} fail-fast: false + runs-on: ${{ matrix.runs_on }} steps: - uses: actions/checkout@v3 From 1f5d65432cf936f13a432d27ae3dd806c1f7472d Mon Sep 17 00:00:00 2001 From: Tino Date: Sun, 15 May 2022 22:46:45 +0800 Subject: [PATCH 6/6] update --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0e79914..529bfd7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,9 +28,9 @@ jobs: # Set up Flutter for all other tasks. setup: needs: matrix_prep - strategy: - matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}} runs-on: ${{ matrix.runs_on }} + strategy: + matrix: ${{ fromJson(needs.matrix_prep.outputs.matrix) }} steps: - uses: actions/checkout@v3 @@ -45,10 +45,10 @@ jobs: build-and-test: needs: setup + runs-on: ${{ matrix.runs_on }} strategy: matrix: ${{ fromJson(needs.matrix_prep.outputs.matrix) }} fail-fast: false - runs-on: ${{ matrix.runs_on }} steps: - uses: actions/checkout@v3