You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2024/08/20 14:28:20 UTC
svn commit: r1920065 - in /apr/apr/branches/1.7.x: ./ .github/workflows/macos.yml .github/workflows/windows.yml
Author: jorton
Date: Tue Aug 20 14:28:20 2024
New Revision: 1920065
URL: http://svn.apache.org/viewvc?rev=1920065&view=rev
Log:
Merge r1919715 from trunk:
Disable forever-failing Windows jobs and try to fix MacOS.
Modified:
apr/apr/branches/1.7.x/ (props changed)
apr/apr/branches/1.7.x/.github/workflows/macos.yml
apr/apr/branches/1.7.x/.github/workflows/windows.yml
Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1919715
Modified: apr/apr/branches/1.7.x/.github/workflows/macos.yml
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/.github/workflows/macos.yml?rev=1920065&r1=1920064&r2=1920065&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/.github/workflows/macos.yml (original)
+++ apr/apr/branches/1.7.x/.github/workflows/macos.yml Tue Aug 20 14:28:20 2024
@@ -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
Modified: apr/apr/branches/1.7.x/.github/workflows/windows.yml
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/.github/workflows/windows.yml?rev=1920065&r1=1920064&r2=1920065&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/.github/workflows/windows.yml (original)
+++ apr/apr/branches/1.7.x/.github/workflows/windows.yml Tue Aug 20 14:28:20 2024
@@ -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