]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
CI: use gmake in Cirrus FreeBSD build 2800/head
authorMartin Matuska <martin@matuska.de>
Fri, 28 Nov 2025 21:31:25 +0000 (22:31 +0100)
committerMartin Matuska <martin@matuska.de>
Fri, 28 Nov 2025 21:31:25 +0000 (22:31 +0100)
.cirrus.yml
build/ci/cirrus_ci/ci.sh

index f719431f539f9fe94cb08e8c73a00fab41a780db..d5c6d65b5120697e4af0beb2f61579f9893ac861 100644 (file)
@@ -17,14 +17,14 @@ FreeBSD_task:
   - ./build/ci/cirrus_ci/ci.sh prepare
   configure_script:
   - env CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./build/ci/build.sh -a autogen
-  - env CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./build/ci/build.sh -a configure
+  - env MAKE=gmake CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./build/ci/build.sh -a configure
   build_script:
-  - env MAKE_ARGS="-j 2" ./build/ci/build.sh -a build
+  - env MAKE=gmake MAKE_ARGS="-j 2" ./build/ci/build.sh -a build
   test_script:
-  - env SKIP_TEST_RESTORE_ATIME=1 MAKE_ARGS="-j 2" ./build/ci/build.sh -a test
+  - env MAKE=gmake SKIP_TEST_RESTORE_ATIME=1 MAKE_ARGS="-j 2" ./build/ci/build.sh -a test
   - ./build/ci/cirrus_ci/ci.sh test
   install_script:
-  - env MAKE_ARGS="-j 2" ./build/ci/build.sh -a install
+  - env MAKE=gmake MAKE_ARGS="-j 2" ./build/ci/build.sh -a install
 
 Windows_Cygwin_task:
   windows_container:
index 29425121ff49331c991399e272419920e737c90a..2312057234104da2dcbd76b94cd0a35f416ec0ba 100755 (executable)
@@ -23,7 +23,7 @@ then
                tunefs -N enable /dev/$MD
                mount /dev/$MD /tmp_acl_nfsv4
                chmod 1777 /tmp_acl_nfsv4
-               pkg install -y autoconf automake cmake libiconv libtool pkgconf expat libxml2 liblz4 zstd
+               pkg install -y autoconf automake cmake libiconv libtool pkgconf expat libxml2 liblz4 zstd gmake
        elif [ "${UNAME}" = "Darwin" ]
        then
                set -x -e