svn commit: r1935561 - in apr/apr/branches/1.7.x: . .github/workflows

Author: brane
Date: Tue Jun 23 01:51:08 2026
New Revision: 1935561

Log:
Merged r1935352 and r1935353 from trunk:

1. Upgrade GitHub workflows to use actions/checkout@v6 to avoid these warnings:

    Node.js 20 actions are deprecated. The following actions are running
    on Node.js 20 and may not work as expected: actions/checkout@v4.
    Actions will be forced to run with Node.js 24 by default starting
    June 16th, 2026. Node.js 20 will be removed from the runner on
    September 16th, 2026.

2. Set svn:eol-style=native on .github/workflows/windows-vcpkg.yml.

Modified:
   apr/apr/branches/1.7.x/   (props changed)
   apr/apr/branches/1.7.x/.github/workflows/linux.yml
   apr/apr/branches/1.7.x/.github/workflows/macos.yml
   apr/apr/branches/1.7.x/.github/workflows/windows-vcpkg.yml   (contents, props changed)
   apr/apr/branches/1.7.x/.github/workflows/windows.yml

Modified: apr/apr/branches/1.7.x/.github/workflows/linux.yml
==============================================================================
--- apr/apr/branches/1.7.x/.github/workflows/linux.yml	Tue Jun 23 00:45:04 2026	(r1935560)
+++ apr/apr/branches/1.7.x/.github/workflows/linux.yml	Tue Jun 23 01:51:08 2026	(r1935561)
@@ -57,7 +57,7 @@ jobs:
     steps:
     - name: Install prerequisites
       run: sudo apt-get install libtool libtool-bin
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     # https://github.com/actions/runner-images/issues/9491#issuecomment-1989718917
     - name: Workaround ASAN issue in Ubuntu 22.04 runners
       run: sudo sysctl vm.mmap_rnd_bits=28

Modified: apr/apr/branches/1.7.x/.github/workflows/macos.yml
==============================================================================
--- apr/apr/branches/1.7.x/.github/workflows/macos.yml	Tue Jun 23 00:45:04 2026	(r1935560)
+++ apr/apr/branches/1.7.x/.github/workflows/macos.yml	Tue Jun 23 01:51:08 2026	(r1935561)
@@ -25,7 +25,7 @@ jobs:
     steps:
     - name: Install prerequisites
       run: brew install libtool autoconf make bash
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: buildconf
       run: ./buildconf
     - name: configure

Modified: apr/apr/branches/1.7.x/.github/workflows/windows-vcpkg.yml
==============================================================================
--- apr/apr/branches/1.7.x/.github/workflows/windows-vcpkg.yml	Tue Jun 23 00:45:04 2026	(r1935560)
+++ apr/apr/branches/1.7.x/.github/workflows/windows-vcpkg.yml	Tue Jun 23 01:51:08 2026	(r1935561)
@@ -1,44 +1,44 @@
-name: Vcpkg (Windows)
-
-on:
-  push:
-    branches: [ "1.7.x*" ]
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [windows-latest]
-        triplet:
-        - x64-windows
-        - x64-windows-static
-        - x64-windows-static-md
-        - x86-windows
-        - x86-windows-static
-        port:
-        - apr
-        - apr[core]
-        - apr[private-headers]
-      fail-fast: false
-    
-    name: "${{ matrix.port }}:${{ matrix.triplet }} on ${{ matrix.os }}"
-    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
-    # You can convert this to a matrix build if you need cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ${{ matrix.os }}
-
-    env: 
-      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-
-    steps:
-    - name: Export GitHub Actions cache environment variables
-      uses: actions/github-script@v7
-      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-    - uses: actions/checkout@v4
-
-    - name: Vcpkg Install
-      run: C:\vcpkg\vcpkg.exe install ${{ matrix.port }} --head --overlay-ports ${{ github.workspace }}\build\vcpkg --triplet ${{ matrix.triplet }} --enforce-port-checks
+name: Vcpkg (Windows)
+
+on:
+  push:
+    branches: [ "1.7.x*" ]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [windows-latest]
+        triplet:
+        - x64-windows
+        - x64-windows-static
+        - x64-windows-static-md
+        - x86-windows
+        - x86-windows-static
+        port:
+        - apr
+        - apr[core]
+        - apr[private-headers]
+      fail-fast: false
+    
+    name: "${{ matrix.port }}:${{ matrix.triplet }} on ${{ matrix.os }}"
+    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
+    # You can convert this to a matrix build if you need cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ${{ matrix.os }}
+
+    env: 
+      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+
+    steps:
+    - name: Export GitHub Actions cache environment variables
+      uses: actions/github-script@v7
+      with:
+        script: |
+          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+    - uses: actions/checkout@v6
+
+    - name: Vcpkg Install
+      run: C:\vcpkg\vcpkg.exe install ${{ matrix.port }} --head --overlay-ports ${{ github.workspace }}\build\vcpkg --triplet ${{ matrix.triplet }} --enforce-port-checks

Modified: apr/apr/branches/1.7.x/.github/workflows/windows.yml
==============================================================================
--- apr/apr/branches/1.7.x/.github/workflows/windows.yml	Tue Jun 23 00:45:04 2026	(r1935560)
+++ apr/apr/branches/1.7.x/.github/workflows/windows.yml	Tue Jun 23 01:51:08 2026	(r1935561)
@@ -26,7 +26,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.