From 568859d16f456c9ad095783726150f35cba15698 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Wed, 3 Jan 2024 17:31:16 +0100 Subject: [PATCH] CI updates --- .github/workflows/ci.yml | 4 ++-- .github/workflows/misc-spell-check.yml | 2 +- .github/workflows/test-cmake-default.yml | 4 ++-- .github/workflows/weekly-ci-bs-by-hand.yml | 2 +- .github/workflows/weekly-ci-bs-cmake-windows-make.yml | 2 +- .github/workflows/weekly-ci-bs-cmake-windows-ninja.yml | 2 +- .github/workflows/weekly-ci-bs-cmake-windows-nmake.yml | 2 +- .github/workflows/weekly-ci-cc-alpine-linux.yml | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b691773..d5ebf7f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -267,7 +267,7 @@ jobs: - name: 'Check out test suite' run: 'git clone --depth=1 https://github.com/upx/upx-testsuite ../deps/upx-testsuite' - name: 'Set up Developer Command Prompt' - uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1 + uses: ilammy/msvc-dev-cmd@v1 with: vsversion: ${{ matrix.vsversion }} arch: ${{ matrix.arch }} @@ -333,7 +333,7 @@ jobs: repository_name="${GITHUB_REPOSITORY##*/}" # basename echo "H=d:\\a\\$repository_name\\$repository_name" >> $GITHUB_ENV - name: 'Set up Developer Command Prompt' - uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1 + uses: ilammy/msvc-dev-cmd@v1 with: vsversion: ${{ matrix.vsversion }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/misc-spell-check.yml b/.github/workflows/misc-spell-check.yml index 9d510eb2..ec8040f2 100644 --- a/.github/workflows/misc-spell-check.yml +++ b/.github/workflows/misc-spell-check.yml @@ -17,5 +17,5 @@ jobs: uses: actions/checkout@v4 with: { submodules: false } - name: 'Spell check with crate-ci/typos' - uses: crate-ci/typos@45a880d9f898547e8bfe6525b6059d4b3dea4d71 # v1.16.26 + uses: crate-ci/typos@master with: { config: ./.github/typos_config.toml } diff --git a/.github/workflows/test-cmake-default.yml b/.github/workflows/test-cmake-default.yml index 293cb055..c62d5762 100644 --- a/.github/workflows/test-cmake-default.yml +++ b/.github/workflows/test-cmake-default.yml @@ -57,7 +57,7 @@ jobs: uses: actions/checkout@v4 with: { submodules: true } - name: 'Set up Developer Command Prompt' - uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1 + uses: ilammy/msvc-dev-cmd@v1 with: vsversion: 2022 arch: amd64 @@ -107,7 +107,7 @@ jobs: uses: actions/checkout@v4 with: { submodules: true } - name: 'Set up Developer Command Prompt' - uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1 + uses: ilammy/msvc-dev-cmd@v1 with: vsversion: 2022 arch: amd64 diff --git a/.github/workflows/weekly-ci-bs-by-hand.yml b/.github/workflows/weekly-ci-bs-by-hand.yml index 88c31767..e6816bb7 100644 --- a/.github/workflows/weekly-ci-bs-by-hand.yml +++ b/.github/workflows/weekly-ci-bs-by-hand.yml @@ -223,7 +223,7 @@ jobs: git clone --branch "$GITHUB_REF_NAME" --depth 1 "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" "upx with space" git -C "upx with space" submodule update --init - name: 'Set up Developer Command Prompt' - uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1 + uses: ilammy/msvc-dev-cmd@v1 with: vsversion: ${{ matrix.vsversion }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/weekly-ci-bs-cmake-windows-make.yml b/.github/workflows/weekly-ci-bs-cmake-windows-make.yml index 31640148..136cce9a 100644 --- a/.github/workflows/weekly-ci-bs-cmake-windows-make.yml +++ b/.github/workflows/weekly-ci-bs-cmake-windows-make.yml @@ -51,7 +51,7 @@ jobs: with: { submodules: true } - name: 'Set up Developer Command Prompt' if: matrix.vsversion - uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1 + uses: ilammy/msvc-dev-cmd@v1 with: vsversion: ${{ matrix.vsversion }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/weekly-ci-bs-cmake-windows-ninja.yml b/.github/workflows/weekly-ci-bs-cmake-windows-ninja.yml index 76353c3d..bc662ae6 100644 --- a/.github/workflows/weekly-ci-bs-cmake-windows-ninja.yml +++ b/.github/workflows/weekly-ci-bs-cmake-windows-ninja.yml @@ -49,7 +49,7 @@ jobs: with: { submodules: true } - name: 'Set up Developer Command Prompt' if: matrix.vsversion - uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1 + uses: ilammy/msvc-dev-cmd@v1 with: vsversion: ${{ matrix.vsversion }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/weekly-ci-bs-cmake-windows-nmake.yml b/.github/workflows/weekly-ci-bs-cmake-windows-nmake.yml index 2a787c89..607618f5 100644 --- a/.github/workflows/weekly-ci-bs-cmake-windows-nmake.yml +++ b/.github/workflows/weekly-ci-bs-cmake-windows-nmake.yml @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@v4 with: { submodules: true } - name: 'Set up Developer Command Prompt' - uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1 + uses: ilammy/msvc-dev-cmd@v1 with: vsversion: ${{ matrix.vsversion }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/weekly-ci-cc-alpine-linux.yml b/.github/workflows/weekly-ci-cc-alpine-linux.yml index 206def02..19eafe0e 100644 --- a/.github/workflows/weekly-ci-cc-alpine-linux.yml +++ b/.github/workflows/weekly-ci-cc-alpine-linux.yml @@ -33,8 +33,8 @@ jobs: - { container: 'alpine:3.10', use_cxx20: 0, use_cxx2b: 0, use_lto: 0 } - { container: 'alpine:3.11', use_cxx20: 0, use_cxx2b: 0, use_lto: 0 } - { container: 'alpine:3.12', use_cxx20: 0, use_cxx2b: 0, use_lto: 0 } - - { container: 'alpine:3.13', use_cxx20: 1, use_cxx2b: 0, use_lto: 0 } # Jan 2021: C++20; clang-10 & gcc-10 - - { container: 'alpine:3.14', use_cxx20: 1, use_cxx2b: 0, use_lto: 0 } + - { container: 'alpine:3.13', use_cxx20: 0, use_cxx2b: 0, use_lto: 0 } # Jan 2021: C++20; clang-10 & gcc-10; INFO: clang-10 is NOT fully C++20 compatible + - { container: 'alpine:3.14', use_cxx20: 1, use_cxx2b: 0, use_lto: 0 } # Jun 2011: C++20; clang-11 & gcc-10 - { container: 'alpine:3.15', use_cxx20: 1, use_cxx2b: 0, use_lto: 1 } # Nov 2021: LTO; clang-12 & gcc-10 & binutils-2.37 - { container: 'alpine:3.16', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 } # May 2022: C++2b; clang-13 & gcc-11 - { container: 'alpine:3.17', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 }