diff --git a/ci/configs/olddeps.bash b/ci/configs/olddeps.bash index 76082c7a..1d9ea6fc 100644 --- a/ci/configs/olddeps.bash +++ b/ci/configs/olddeps.bash @@ -1,8 +1,8 @@ CI_DESC="CI job using old Cap'n Proto and cmake versions" CI_DIR=build-olddeps -# Pin olddeps to an older Nixpkgs channel, since compiling the old CMake -# requires an older GCC. +# Pin olddeps to an older Nixpkgs channel, to be able to test an older GCC. CI_NIXPKGS_CHANNEL=nixos-25.05 export CXXFLAGS="-Werror -Wall -Wextra -Wpedantic -Wno-unused-parameter -Wno-error=array-bounds" -NIX_ARGS=(--argstr capnprotoVersion "0.9.2" --argstr cmakeVersion "3.12.4" --argstr gccVersion "11") +CAPNP_CHECKOUT=v0.9.2 # Use a checkout to compile it with the selected GCC +NIX_ARGS=(--argstr capnprotoVersion "none" --argstr cmakeVersion "3.12.4" --argstr gccVersion "10") BUILD_ARGS=(-k) diff --git a/ci/scripts/ci.sh b/ci/scripts/ci.sh index a91a5e71..8016d921 100755 --- a/ci/scripts/ci.sh +++ b/ci/scripts/ci.sh @@ -32,7 +32,7 @@ if [ -n "${CAPNP_CHECKOUT-}" ]; then git --no-pager log -1 || true CXXFLAGS="-std=c++20" cmake .. "-DCMAKE_INSTALL_PREFIX=${capnp_prefix}" -DBUILD_TESTING=OFF -DWITH_OPENSSL=OFF -DWITH_ZLIB=OFF cmake --build . - cmake --install . + cmake --build . --target install # Replacement for modern "cmake --install .". ) export CMAKE_PREFIX_PATH="${capnp_prefix}:${CMAKE_PREFIX_PATH-}" fi