svn commit: r1934008 - in subversion/branches/1.15.x: . .github/workflows

Author: ivan
Date: Sat May  9 20:46:34 2026
New Revision: 1934008

Log:
On 1.5.x branch: Merge r1933956, r1933957, r1934000, r1934001 from trunk.
  Update .github/workflows/*.

Modified:
   subversion/branches/1.15.x/   (props changed)
   subversion/branches/1.15.x/.github/workflows/autoconf.yml
   subversion/branches/1.15.x/.github/workflows/cmake.yml

Modified: subversion/branches/1.15.x/.github/workflows/autoconf.yml
==============================================================================
--- subversion/branches/1.15.x/.github/workflows/autoconf.yml	Sat May  9 20:38:05 2026	(r1934007)
+++ subversion/branches/1.15.x/.github/workflows/autoconf.yml	Sat May  9 20:46:34 2026	(r1934008)
@@ -82,7 +82,7 @@ jobs:
           ./configure --prefix=$HOME/root/httpd --enable-mpms-shared=event --enable-mods-shared=most --enable-dav
           make -j
           make install
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: autogen
         run: ./autogen.sh

Modified: subversion/branches/1.15.x/.github/workflows/cmake.yml
==============================================================================
--- subversion/branches/1.15.x/.github/workflows/cmake.yml	Sat May  9 20:38:05 2026	(r1934007)
+++ subversion/branches/1.15.x/.github/workflows/cmake.yml	Sat May  9 20:46:34 2026	(r1934008)
@@ -42,27 +42,27 @@ jobs:
       matrix:
         include:
           - name: Windows, shared, x64, with tests
-            os: windows-latest
+            os: windows-2022
             build_shared: ON
             cmake_generator: Ninja
             vcpkg_triplet: x64-windows
             arch: x64
             run_tests: true
           - name: Windows, shared, x64, vs2022, with tests
-            os: windows-latest
+            os: windows-2022
             build_shared: ON
             cmake_generator: 'Visual Studio 17 2022'
             vcpkg_triplet: x64-windows
             arch: x64
             run_tests: true
           - name: Windows, shared, x86
-            os: windows-latest
+            os: windows-2022
             build_shared: ON
             cmake_generator: Ninja
             vcpkg_triplet: x86-windows
             arch: x86
           - name: Windows, static, x64, with tests
-            os: windows-latest
+            os: windows-2022
             build_shared: OFF
             cmake_generator: Ninja
             vcpkg_triplet: x64-windows-static-md
@@ -100,8 +100,8 @@ jobs:
       - name: Prepare Environment (Windows)
         if: runner.os == 'Windows'
         run: |
-          $root = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
-          Import-Module "$root\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
+          $root = &(Join-Path ${env:ProgramFiles(x86)} "\Microsoft Visual Studio\Installer\vswhere.exe") -property installationpath -latest
+          Import-Module (Join-Path $root "Common7\Tools\Microsoft.VisualStudio.DevShell.dll")
           Enter-VsDevShell -VsInstallPath $root -DevCmdArguments "-arch=${{ matrix.arch }}"
 
           ls env: | foreach { "$($_.Name)=$($_.Value)" >> $env:GITHUB_ENV }
@@ -154,7 +154,7 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: gen-make
         run: python ./gen-make.py -t cmake