From 253d61945b8c2d8eeb6a6acc5758e4da215f1e2e Mon Sep 17 00:00:00 2001 From: Hans Kristian Rosbach Date: Tue, 7 Feb 2023 17:10:06 +0100 Subject: [PATCH 1/6] Update to actions/upload-artifact@v3 --- .github/workflows/configure.yml | 2 +- .github/workflows/fuzz.yml | 2 +- .github/workflows/link.yml | 4 ++-- .github/workflows/pigz.yml | 2 +- .github/workflows/pkgcheck.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml index c2927f73b3..634ba98a1a 100644 --- a/.github/workflows/configure.yml +++ b/.github/workflows/configure.yml @@ -220,7 +220,7 @@ jobs: working-directory: ${{ matrix.build-dir }} - name: Upload build errors - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: ${{ matrix.name }} (configure) diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index b108461033..95d64e67ae 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -29,7 +29,7 @@ jobs: dry-run: false - name: Upload Crash - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 if: failure() with: name: artifacts diff --git a/.github/workflows/link.yml b/.github/workflows/link.yml index 0ac4f5cff4..918720f517 100644 --- a/.github/workflows/link.yml +++ b/.github/workflows/link.yml @@ -27,7 +27,7 @@ jobs: run: cmake --build native --config Release - name: Upload build errors - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: Link zlib (CMake Logs) @@ -56,7 +56,7 @@ jobs: run: cmake --build native --config Release - name: Upload build errors - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: Link zlib-ng compat (CMake Logs) diff --git a/.github/workflows/pigz.yml b/.github/workflows/pigz.yml index 4400892440..15108a2feb 100644 --- a/.github/workflows/pigz.yml +++ b/.github/workflows/pigz.yml @@ -111,7 +111,7 @@ jobs: CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}} - name: Upload build errors - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: ${{ matrix.name }} (cmake) diff --git a/.github/workflows/pkgcheck.yml b/.github/workflows/pkgcheck.yml index 180c2433ba..0bb97fd843 100644 --- a/.github/workflows/pkgcheck.yml +++ b/.github/workflows/pkgcheck.yml @@ -153,7 +153,7 @@ jobs: LDFLAGS: ${{ matrix.ldflags }} - name: Upload build errors - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: ${{ matrix.name }} From 285a49ba4c3b0fcdb7f8c542f254d50e256cebe2 Mon Sep 17 00:00:00 2001 From: Hans Kristian Rosbach Date: Tue, 7 Feb 2023 17:18:54 +0100 Subject: [PATCH 2/6] Update codecov uploader --- .github/workflows/cmake.yml | 4 ++-- .github/workflows/pigz.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 11ed5311a1..adb9db7994 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -548,7 +548,7 @@ jobs: --xml --output coverage.xml - name: Upload coverage report - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v3 if: matrix.codecov && (env.CODECOV_TOKEN != '' || github.repository == 'zlib-ng/zlib-ng') with: token: ${{ secrets.CODECOV_TOKEN || 'e4fdf847-f541-4ab1-9d50-3d27e5913906' }} @@ -561,7 +561,7 @@ jobs: CODECOV_TOKEN: "${{secrets.CODECOV_TOKEN}}" - name: Upload build errors - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: failure() with: name: ${{ matrix.name }} (cmake) diff --git a/.github/workflows/pigz.yml b/.github/workflows/pigz.yml index 15108a2feb..6a505a119e 100644 --- a/.github/workflows/pigz.yml +++ b/.github/workflows/pigz.yml @@ -99,7 +99,7 @@ jobs: --xml --output coverage.xml - name: Upload coverage report - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v3 if: matrix.codecov && (env.CODECOV_TOKEN != '' || github.repository == 'zlib-ng/zlib-ng') with: token: ${{ secrets.CODECOV_TOKEN || 'e4fdf847-f541-4ab1-9d50-3d27e5913906' }} From 7866220afe51e752c0102db967553453a4adc7b2 Mon Sep 17 00:00:00 2001 From: Hans Kristian Rosbach Date: Tue, 7 Feb 2023 17:19:05 +0100 Subject: [PATCH 3/6] Update release uploader --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2a3327b479..768cf48bcb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -88,7 +88,7 @@ jobs: working-directory: out - name: Upload release (Windows) - uses: svenstaro/upload-release-action@v1-release + uses: svenstaro/upload-release-action@v2 if: runner.os == 'Windows' with: asset_name: zlib-ng-${{ matrix.deploy-name }}.zip From 503cfbe18a11e1f20d94591009ad9d8b972a6855 Mon Sep 17 00:00:00 2001 From: Hans Kristian Rosbach Date: Tue, 7 Feb 2023 17:20:24 +0100 Subject: [PATCH 4/6] Update ilammy/msvc-dev-cmd --- .github/workflows/nmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nmake.yml b/.github/workflows/nmake.yml index f8c61af009..38e6690933 100644 --- a/.github/workflows/nmake.yml +++ b/.github/workflows/nmake.yml @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v3 - name: Setup development environment - uses: ilammy/msvc-dev-cmd@v1.10.0 + uses: ilammy/msvc-dev-cmd@v1.12.1 with: arch: ${{ matrix.arch }} From c00a69ed57b035cecc088ef5f898ee33cb9bdfbd Mon Sep 17 00:00:00 2001 From: Hans Kristian Rosbach Date: Tue, 7 Feb 2023 17:23:06 +0100 Subject: [PATCH 5/6] Update mymindstorm/setup-emsdk --- .github/workflows/cmake.yml | 2 +- .github/workflows/configure.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index adb9db7994..4878038acc 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -482,7 +482,7 @@ jobs: - name: Install Emscripten if: contains(matrix.name, 'WASM32') - uses: mymindstorm/setup-emsdk@v11 + uses: mymindstorm/setup-emsdk@v12 - name: Initialize Wine # Prevent parallel test jobs from initializing Wine at the same time diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml index 634ba98a1a..7f2a8683b5 100644 --- a/.github/workflows/configure.yml +++ b/.github/workflows/configure.yml @@ -196,7 +196,7 @@ jobs: - name: Install Emscripten if: contains(matrix.name, 'WASM32') - uses: mymindstorm/setup-emsdk@v11 + uses: mymindstorm/setup-emsdk@v12 - name: Generate project files run: | From a45e61aa48e4c07b45ef2c7947782879633e91c5 Mon Sep 17 00:00:00 2001 From: Hans Kristian Rosbach Date: Tue, 7 Feb 2023 23:18:31 +0100 Subject: [PATCH 6/6] Ubuntu 18.04 is being removed shortly, update workflows to use 20.04. Clang-6.0 is still supported according to Ubuntu package list website. --- .github/workflows/cmake.yml | 8 ++++---- .github/workflows/configure.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 4878038acc..1d0eeeb246 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -12,8 +12,8 @@ jobs: fail-fast: false matrix: include: - - name: Ubuntu 18.04 GCC - os: ubuntu-18.04 + - name: Ubuntu 20.04 GCC + os: ubuntu-20.04 compiler: gcc cxx-compiler: g++ @@ -281,8 +281,8 @@ jobs: # Limit parallel test jobs to prevent wine errors parallels-jobs: 1 - - name: Ubuntu 18.04 Clang - os: ubuntu-18.04 + - name: Ubuntu 20.04 Clang + os: ubuntu-20.04 compiler: clang-6.0 cxx-compiler: clang++-6.0 packages: clang-6.0 diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml index 7f2a8683b5..e0dde6f9be 100644 --- a/.github/workflows/configure.yml +++ b/.github/workflows/configure.yml @@ -13,8 +13,8 @@ jobs: compiler: gcc configure-args: --warn - - name: Ubuntu 18.04 GCC - os: ubuntu-18.04 + - name: Ubuntu 20.04 GCC + os: ubuntu-20.04 compiler: gcc configure-args: --warn