From f8b737a411535a5395eedb61d6a5be452564468c Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Sun, 3 Mar 2024 11:59:54 +0100 Subject: [PATCH 1/7] update github actions checkout -> v4 upload-artifact -> v4 --- .github/workflows/create-release.yml | 26 ++++++++++++------------ .github/workflows/master-build.yml | 30 ++++++++++++++-------------- .github/workflows/pr-build.yml | 30 ++++++++++++++-------------- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 14d2798e..fb5af63b 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -16,12 +16,12 @@ jobs: target: [static_lib, shared_lib, cmd] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build ${{matrix.target}} run: | ${{matrix.target}}/build.sh ${{matrix.config}} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: name: linux_x64-${{matrix.target}}-${{matrix.config}} @@ -35,14 +35,14 @@ jobs: needs: build-linux runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: path: build/artifacts - name: build dist run: | ./dist.sh - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: dist-linux-x64 path: dist @@ -56,12 +56,12 @@ jobs: target: [static_lib, shared_lib, cmd] arch: [arm64, x64] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build ${{matrix.target}} run: | ${{matrix.target}}/build.sh ${{matrix.config}} ${{matrix.arch}} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: name: darwin_${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} @@ -78,14 +78,14 @@ jobs: matrix: arch: [arm64, x64] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: path: build/artifacts - name: build dist run: | ./dist.sh ${{matrix.arch}} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: dist-darwin-${{matrix.arch}} path: dist @@ -99,12 +99,12 @@ jobs: target: [static_lib, shared_lib, cmd] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build ${{matrix.target}} run: | ${{matrix.target}}/build.bat ${{matrix.config}} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: name: win32_x64-${{matrix.target}}-${{matrix.config}} @@ -119,14 +119,14 @@ jobs: needs: build-win32 runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: path: build/artifacts - name: build dist run: | ./dist.bat - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: dist-win32-x64 path: dist @@ -139,7 +139,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download Linux artifacts uses: actions/download-artifact@v1 diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml index 0133a62c..fb2dae63 100644 --- a/.github/workflows/master-build.yml +++ b/.github/workflows/master-build.yml @@ -14,12 +14,12 @@ jobs: target: [static_lib, shared_lib, cmd] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build ${{matrix.target}} run: | ${{matrix.target}}/build.sh ${{matrix.config}} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: name: linux_x64-${{matrix.target}}-${{matrix.config}} @@ -35,7 +35,7 @@ jobs: matrix: config: [debug, release] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build test run: | test/build.sh ${{matrix.config}} @@ -50,14 +50,14 @@ jobs: needs: build-linux runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: path: build/artifacts - name: build dist run: | ./dist.sh - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: dist-linux-x64 path: dist @@ -71,12 +71,12 @@ jobs: target: [static_lib, shared_lib, cmd] arch: [arm64, x64] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build ${{matrix.target}} run: | ${{matrix.target}}/build.sh ${{matrix.config}} ${{matrix.arch}} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: name: darwin_${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} @@ -93,7 +93,7 @@ jobs: config: [debug, release] arch: [arm64, x64] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build test run: | test/build.sh ${{matrix.config}} ${{matrix.arch}} @@ -112,14 +112,14 @@ jobs: matrix: arch: [arm64, x64] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: path: build/artifacts - name: build dist run: | ./dist.sh ${{matrix.arch}} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: dist-darwin-${{matrix.arch}} path: dist @@ -133,12 +133,12 @@ jobs: target: [static_lib, shared_lib, cmd] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build ${{matrix.target}} run: | ${{matrix.target}}/build.bat ${{matrix.config}} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: name: win32_x64-${{matrix.target}}-${{matrix.config}} @@ -155,7 +155,7 @@ jobs: matrix: config: [debug, release] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build test run: | test/build.bat ${{matrix.config}} @@ -170,14 +170,14 @@ jobs: needs: build-win32 runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: path: build/artifacts - name: build dist run: | ./dist.bat - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: dist-win32-x64 path: dist diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 0bea6a64..ba26aa5e 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -23,12 +23,12 @@ jobs: target: [static_lib, shared_lib, cmd] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build ${{matrix.target}} run: | ${{matrix.target}}/build.sh ${{matrix.config}} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: name: linux_x64-${{matrix.target}}-${{matrix.config}} @@ -44,7 +44,7 @@ jobs: matrix: config: [debug, release] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build test run: | test/build.sh ${{matrix.config}} @@ -59,14 +59,14 @@ jobs: needs: build-linux runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: path: build/artifacts - name: build dist run: | ./dist.sh - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: dist-linux-x64 path: dist @@ -81,12 +81,12 @@ jobs: arch: [x64, arm64] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build ${{matrix.target}} run: | ${{matrix.target}}/build.sh ${{matrix.config}} ${{matrix.arch}} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: name: darwin_${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} @@ -103,7 +103,7 @@ jobs: config: [debug, release] arch: [arm64, x64] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build test run: | test/build.sh ${{matrix.config}} ${{matrix.arch}} @@ -122,14 +122,14 @@ jobs: matrix: arch: [x64, arm64] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: path: build/artifacts - name: build dist run: | ./dist.sh ${{matrix.arch}} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: dist-darwin-${{matrix.arch}} path: dist @@ -143,12 +143,12 @@ jobs: target: [static_lib, shared_lib, cmd] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build ${{matrix.target}} run: | ${{matrix.target}}/build.bat ${{matrix.config}} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: name: win32_x64-${{matrix.target}}-${{matrix.config}} @@ -165,7 +165,7 @@ jobs: matrix: config: [debug, release] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build test run: | test/build.bat ${{matrix.config}} @@ -180,14 +180,14 @@ jobs: needs: build-win32 runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: path: build/artifacts - name: build dist run: | ./dist.bat - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: dist-win32-x64 path: dist From 3665167479185fc3983a02bedb0acd83705cb902 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Sun, 3 Mar 2024 12:01:50 +0100 Subject: [PATCH 2/7] update cancel-workflow-action to 0.12 --- .github/workflows/pr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index ba26aa5e..ea7b5119 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.11.0 + uses: styfle/cancel-workflow-action@0.12 with: access_token: ${{ github.token }} From 6a4926aee250a057c461cee015a2692cbb42d5f6 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Sun, 3 Mar 2024 12:09:21 +0100 Subject: [PATCH 3/7] don't use underscore in artifact names --- .github/workflows/create-release.yml | 6 +++--- .github/workflows/master-build.yml | 6 +++--- .github/workflows/pr-build.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index fb5af63b..365f482a 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: linux_x64-${{matrix.target}}-${{matrix.config}} + name: linux-x64-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.o @@ -64,7 +64,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: darwin_${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} + name: darwin-${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.o @@ -107,7 +107,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: win32_x64-${{matrix.target}}-${{matrix.config}} + name: win32-x64-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.obj diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml index fb2dae63..f4c37f0b 100644 --- a/.github/workflows/master-build.yml +++ b/.github/workflows/master-build.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: linux_x64-${{matrix.target}}-${{matrix.config}} + name: linux-x64-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.o @@ -79,7 +79,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: darwin_${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} + name: darwin-${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.o @@ -141,7 +141,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: win32_x64-${{matrix.target}}-${{matrix.config}} + name: win32-x64-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.obj diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index ea7b5119..85eb8c9b 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: linux_x64-${{matrix.target}}-${{matrix.config}} + name: linux-x64-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.o @@ -89,7 +89,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: darwin_${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} + name: darwin-${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.o @@ -151,7 +151,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: win32_x64-${{matrix.target}}-${{matrix.config}} + name: win32-x64-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.obj From a316dfb5a9d7b8274d41699485f15e096d386ee6 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Sun, 3 Mar 2024 12:10:41 +0100 Subject: [PATCH 4/7] use explicit cancel-workflow-action 0.12.1 --- .github/workflows/pr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 85eb8c9b..73ff8473 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.12 + uses: styfle/cancel-workflow-action@0.12.1 with: access_token: ${{ github.token }} From 5bbfbc3dbc8d692d03e9197999fe659ec525eee9 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Sun, 3 Mar 2024 12:18:32 +0100 Subject: [PATCH 5/7] use wildcard name for download action --- .github/workflows/create-release.yml | 3 +++ .github/workflows/master-build.yml | 3 +++ .github/workflows/pr-build.yml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 365f482a..1b47ee99 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -38,6 +38,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: + name: linux-x64-* path: build/artifacts - name: build dist run: | @@ -81,6 +82,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: + name: darwin-x64-* path: build/artifacts - name: build dist run: | @@ -122,6 +124,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: + name: win32-* path: build/artifacts - name: build dist run: | diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml index f4c37f0b..a1df2397 100644 --- a/.github/workflows/master-build.yml +++ b/.github/workflows/master-build.yml @@ -53,6 +53,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: + name: linux-* path: build/artifacts - name: build dist run: | @@ -115,6 +116,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: + name: darwin-* path: build/artifacts - name: build dist run: | @@ -173,6 +175,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: + name: win32-* path: build/artifacts - name: build dist run: | diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 73ff8473..3f33285b 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -62,6 +62,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: + name: linux-* path: build/artifacts - name: build dist run: | @@ -125,6 +126,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: + name: darwin-* path: build/artifacts - name: build dist run: | @@ -183,6 +185,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v3 with: + name: win32-* path: build/artifacts - name: build dist run: | From e85c6ae96a6f5c7baf5ea6f4976b8237c2cd7e98 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Sun, 3 Mar 2024 12:43:43 +0100 Subject: [PATCH 6/7] bump all download to v4 --- .github/workflows/create-release.yml | 15 +++++++++------ .github/workflows/master-build.yml | 15 +++++++++------ .github/workflows/pr-build.yml | 15 +++++++++------ 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 1b47ee99..0bb00ac8 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -36,9 +36,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: linux-x64-* + pattern: linux-* + merge-multiple: true path: build/artifacts - name: build dist run: | @@ -80,9 +81,10 @@ jobs: arch: [arm64, x64] steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: darwin-x64-* + pattern: darwin-* + merge-multiple: true path: build/artifacts - name: build dist run: | @@ -122,9 +124,10 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: win32-* + pattern: win32-* + merge-multiple: true path: build/artifacts - name: build dist run: | diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml index a1df2397..40c0b7fe 100644 --- a/.github/workflows/master-build.yml +++ b/.github/workflows/master-build.yml @@ -51,9 +51,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: linux-* + pattern: linux-* + merge-multiple: true path: build/artifacts - name: build dist run: | @@ -114,9 +115,10 @@ jobs: arch: [arm64, x64] steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: darwin-* + pattern: darwin-* + merge-multiple: true path: build/artifacts - name: build dist run: | @@ -173,9 +175,10 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: win32-* + pattern: win32-* + merge-multiple: true path: build/artifacts - name: build dist run: | diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 3f33285b..7c378cb9 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -60,9 +60,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: linux-* + pattern: linux-* + merge-multiple: true path: build/artifacts - name: build dist run: | @@ -124,9 +125,10 @@ jobs: arch: [x64, arm64] steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: darwin-* + pattern: darwin-* + merge-multiple: true path: build/artifacts - name: build dist run: | @@ -183,9 +185,10 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: win32-* + pattern: win32-* + merge-multiple: true path: build/artifacts - name: build dist run: | From a80574ff5db3010ccf7fde024e9e80284d8f5522 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Sun, 3 Mar 2024 13:39:59 +0100 Subject: [PATCH 7/7] revert name changes --- .github/workflows/create-release.yml | 12 +++--------- .github/workflows/master-build.yml | 12 +++--------- .github/workflows/pr-build.yml | 12 +++--------- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 0bb00ac8..596703d4 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: linux-x64-${{matrix.target}}-${{matrix.config}} + name: linux_x64-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.o @@ -38,8 +38,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 with: - pattern: linux-* - merge-multiple: true path: build/artifacts - name: build dist run: | @@ -66,7 +64,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: darwin-${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} + name: darwin_${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.o @@ -83,8 +81,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 with: - pattern: darwin-* - merge-multiple: true path: build/artifacts - name: build dist run: | @@ -111,7 +107,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: win32-x64-${{matrix.target}}-${{matrix.config}} + name: win32_x64-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.obj @@ -126,8 +122,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 with: - pattern: win32-* - merge-multiple: true path: build/artifacts - name: build dist run: | diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml index 40c0b7fe..be062516 100644 --- a/.github/workflows/master-build.yml +++ b/.github/workflows/master-build.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: linux-x64-${{matrix.target}}-${{matrix.config}} + name: linux_x64-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.o @@ -53,8 +53,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 with: - pattern: linux-* - merge-multiple: true path: build/artifacts - name: build dist run: | @@ -81,7 +79,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: darwin-${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} + name: darwin_${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.o @@ -117,8 +115,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 with: - pattern: darwin-* - merge-multiple: true path: build/artifacts - name: build dist run: | @@ -145,7 +141,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: win32-x64-${{matrix.target}}-${{matrix.config}} + name: win32_x64-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.obj @@ -177,8 +173,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 with: - pattern: win32-* - merge-multiple: true path: build/artifacts - name: build dist run: | diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 7c378cb9..8f9b5e06 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: linux-x64-${{matrix.target}}-${{matrix.config}} + name: linux_x64-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.o @@ -62,8 +62,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 with: - pattern: linux-* - merge-multiple: true path: build/artifacts - name: build dist run: | @@ -91,7 +89,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: darwin-${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} + name: darwin_${{matrix.arch}}-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.o @@ -127,8 +125,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 with: - pattern: darwin-* - merge-multiple: true path: build/artifacts - name: build dist run: | @@ -155,7 +151,7 @@ jobs: - uses: actions/upload-artifact@v4 name: upload ${{matrix.target}} with: - name: win32-x64-${{matrix.target}}-${{matrix.config}} + name: win32_x64-${{matrix.target}}-${{matrix.config}} path: | build/** !build/**/*.obj @@ -187,8 +183,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 with: - pattern: win32-* - merge-multiple: true path: build/artifacts - name: build dist run: |