From acc73edce8c08e24ceadb4f46d2d812cf03fc6bb Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Sun, 10 Nov 2024 22:23:26 +0100 Subject: [PATCH] GHA/non-native: streamline installed packages on FreeBSD Instead of installing the cmake package which is a meta-port (includes documentation and manpages etc) install cmake-core which is cmake itself to save a few cpu cycles. Also drop nghttp2 in favour of the slimmer libnghttp2. Closes #15540 --- .github/workflows/non-native.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/non-native.yml b/.github/workflows/non-native.yml index 5c89b54acc..108f515afd 100644 --- a/.github/workflows/non-native.yml +++ b/.github/workflows/non-native.yml @@ -136,7 +136,7 @@ jobs: run: | # https://ports.freebsd.org/ sudo pkg install -y autoconf automake libtool \ - pkgconf brotli openldap26-client libidn2 libnghttp2 nghttp2 stunnel py311-impacket + pkgconf brotli openldap26-client libidn2 libnghttp2 stunnel py311-impacket autoreconf -fi export CC='${{ matrix.compiler }}' mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-debug --enable-warnings --enable-werror \ @@ -165,8 +165,8 @@ jobs: architecture: ${{ matrix.arch }} run: | # https://ports.freebsd.org/ - sudo pkg install -y cmake ninja perl5 \ - pkgconf brotli openldap26-client libidn2 libnghttp2 nghttp2 stunnel py311-impacket + sudo pkg install -y cmake-core ninja perl5 \ + pkgconf brotli openldap26-client libidn2 libnghttp2 stunnel py311-impacket cmake -B bld -G Ninja \ '-DCMAKE_C_COMPILER=${{ matrix.compiler }}' \ -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \ -- 2.47.3