From 0271f1e83505fa45a79263a9c8bc8fcc2e79d334 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 20 Aug 2024 14:28:20 +0000 Subject: [PATCH] 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 --- .github/workflows/macos.yml | 2 ++ .github/workflows/windows.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 3fa32f20b2..26fd36b8e6 100644 --- 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 index 8a3d1659db..97d369e7c4 100644 --- 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