From: Joe Orton <jorton@apache.org>
Date: Wed, 3 Jun 2026 10:40:17 +0000 (+0000)
Subject: CI: Update used actions to use newer Node.js than 20
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=ca0ff167c823344132fa08f8554154ea43593b7e;p=thirdparty%2Fapache%2Fhttpd.git

CI: Update used actions to use newer Node.js than 20
CI: Update upload-artifact action, drop unnecessary Ubuntu 22.04 fix
CI: Drop 'shell: cmd', use PowerShell for the Windows workflow
CI: Print used CMake version for Windows workflow

Submitted by: Vladimír Chlup <vchlup ibm.com>
Github: closes #660


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1934917 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 33eced1e76..b10cdf14ae 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 }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 3d6f58577a..ee764d3bcf 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 || '');
@@ -57,15 +57,14 @@ 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 --version
+            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 }}