From 57a4926e353235ccb400025dd3ad90bbfb96400d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Chlup?= Date: Tue, 2 Jun 2026 10:17:39 +0200 Subject: [PATCH 1/4] CI: Update used actions to use newer Node.js than 20 --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3d6f58577a0..72904113d77 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -45,7 +45,7 @@ jobs: ls env: | foreach { "$($_.Name)=$($_.Value)" >> $env:GITHUB_ENV } - name: Export GitHub Actions cache environment variables - uses: actions/github-script@v7 + uses: actions/github-script@v8 with: script: | core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); From fea67399a4cd4ccc4a9d949a0eaf1453c868aea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Chlup?= Date: Tue, 2 Jun 2026 10:25:16 +0200 Subject: [PATCH 2/4] CI: Update upload-artifact action, drop unnecessary Ubuntu 22.04 fix --- .github/workflows/linux.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 33eced1e760..b10cdf14ae2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -344,9 +344,6 @@ jobs: echo "${{ matrix.env }}" >> $GITHUB_ENV echo JOBID=`echo "OS=$ImageOS ${{ matrix.notest-cflags }} ${{ matrix.env }} ${{ matrix.config }}" \ | md5sum - | sed 's/ .*//'` >> $GITHUB_ENV - # https://github.com/actions/runner-images/issues/9491#issuecomment-1989718917 - - name: Workaround ASAN issue in Ubuntu 22.04 - run: sudo sysctl vm.mmap_rnd_bits=28 - name: apt refresh run: sudo apt-get -o Acquire::Retries=5 update - name: Install prerequisites @@ -375,7 +372,7 @@ jobs: - name: Configure environment run: ./test/travis_before_linux.sh timeout-minutes: 15 - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: failure() with: name: config.log-${{ env.JOBID }} @@ -383,7 +380,7 @@ jobs: /home/runner/build/**/config.log - name: Build and test run: ./test/travis_run_linux.sh - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: failure() with: name: error_log-${{ env.JOBID }} From 4adc9be3d3a65efbe0dfc7298c9a4aa0e44e4dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Chlup?= Date: Tue, 2 Jun 2026 13:30:04 +0200 Subject: [PATCH 3/4] CI: Drop 'shell: cmd', use PowerShell for the Windows workflow --- .github/workflows/windows.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 72904113d77..27dfa2991ad 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -57,15 +57,13 @@ jobs: - uses: actions/checkout@v6 - name: Configure CMake - shell: cmd run: | - cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ^ - -G "${{ matrix.generator }}" ^ - -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake ^ - -DAPR_INCLUDE_DIR=C:/vcpkg/installed/${{ matrix.triplet }}/include ^ + cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ` + -G "${{ matrix.generator }}" ` + -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake ` + -DAPR_INCLUDE_DIR=C:/vcpkg/installed/${{ matrix.triplet }}/include ` "-DAPR_LIBRARIES=C:/vcpkg/installed/${{ matrix.triplet }}/lib/libapr-1.lib;C:/vcpkg/installed/${{ matrix.triplet }}/lib/libaprutil-1.lib" - name: Build - shell: cmd run: | cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }} From a14cc32697a4ef61410853bfc23e47e570c193d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Chlup?= Date: Wed, 3 Jun 2026 11:23:17 +0200 Subject: [PATCH 4/4] CI: Print used CMake version for Windows workflow --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 27dfa2991ad..ee764d3bcf5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -58,6 +58,7 @@ jobs: - name: Configure CMake run: | + cmake --version cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ` -G "${{ matrix.generator }}" ` -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake `