From 5ecd7014426f7aff749fb7377f14deea1413815c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 2 Aug 2025 09:16:33 +0200 Subject: [PATCH] GHA/macos: install with autotools too --- .github/workflows/macos.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index bde536ee06..68a7141013 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -423,7 +423,7 @@ jobs: fi [ -n "${MATRIX_MACOS_VERSION_MIN}" ] && CFLAGS+=" -mmacosx-version-min=${MATRIX_MACOS_VERSION_MIN}" [[ "${MATRIX_INSTALL_STEPS}" = *'pytest'* ]] && options+=' --with-test-vsftpd=no' # Skip ~20 tests that stretch run time by 7x on macOS - mkdir bld && cd bld && ../configure --enable-unity --enable-warnings --enable-werror \ + mkdir bld && cd bld && ../configure --prefix="$PWD"/curl-install --enable-unity --enable-warnings --enable-werror \ --disable-dependency-tracking \ --with-libpsl=/opt/homebrew/opt/libpsl \ ${MATRIX_CONFIGURE} ${options} @@ -452,9 +452,13 @@ jobs: - name: 'curl version' run: bld/src/curl --disable --version - - name: 'cmake install' - if: ${{ matrix.build.generate }} - run: cmake --install bld --strip + - name: 'curl install' + run: | + if [ "${MATRIX_BUILD}" = 'cmake' ]; then + cmake --install bld --strip + else + make install + fi - name: 'build tests' run: |