Merge r1919715 from trunk:

Disable forever-failing Windows jobs and try to fix MacOS. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1920065 13f79535-47bb-0310-9956-ffa450edef68
apache · Aug 20, 2024 · 0271f1e · 0271f1e
1 parent e12da87
commit 0271f1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -22,6 +22,8 @@ jobs:
       NOTEST_CFLAGS: ${{ matrix.notest-cflags }}
     name: ${{ matrix.name }}
     steps:
+    - name: Install prerequisites
+      run: brew install libtool autoconf make bash
     - uses: actions/checkout@v4
     - name: buildconf
       run: ./buildconf

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -15,7 +15,7 @@ jobs:
         build-type: [Debug, Release]
         generator: [ "Visual Studio 17 2022" ]
         arch: [ "Win32", "x64" ]
-        toolset: [ "v143", "v142", "v141" ]
+        toolset: [ "v143", "v142" ]
         test-static: [ "ON", "OFF" ]
       fail-fast: false