From f88c3de3db189c07b6d40b5e8a8368852fbd9855 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Fri, 31 May 2024 09:20:42 +0700 Subject: [PATCH] cirrus-ci: use matrix to remove redundant parts on building bsds (apply to `main`) [ resolve conflicts - Trevor ] (cherry picked from commit 195309886667e53dde98b2e6bbe47a7d9bc6bab3) --- .cirrus.yml | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 18753922ed651..bd9100b9b0eb4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,40 +1,19 @@ task: - name: nightly x86_64-unknown-freebsd-13 - freebsd_instance: - image_family: freebsd-13-3 + only_if: $CIRRUS_BRANCH == 'main' || $CIRRUS_BASE_BRANCH == 'libc-0.2' || $CIRRUS_BASE_BRANCH == 'main' + matrix: + - name: nightly freebsd-13 + freebsd_instance: + image_family: freebsd-13-3 + - name: nightly freebsd-14 + freebsd_instance: + image: freebsd-14-1-release-amd64-ufs + - name: nightly freebsd-15 + freebsd_instance: + image_family: freebsd-15-0-snap setup_script: - pkg install -y libnghttp2 curl - curl https://sh.rustup.rs -sSf --output rustup.sh - sh rustup.sh -y --default-toolchain nightly --profile=minimal - - . $HOME/.cargo/env - test_script: - - . $HOME/.cargo/env - - LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd - - sh ci/run.sh x86_64-unknown-freebsd - -task: - name: nightly x86_64-unknown-freebsd-14 - freebsd_instance: - image: freebsd-14-1-release-amd64-ufs - setup_script: - - pkg install -y libnghttp2 curl - - curl https://sh.rustup.rs -sSf --output rustup.sh - - sh rustup.sh -y --default-toolchain nightly --profile=minimal - - . $HOME/.cargo/env - test_script: - - . $HOME/.cargo/env - - LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd - - sh ci/run.sh x86_64-unknown-freebsd - -task: - name: nightly x86_64-unknown-freebsd-15 - freebsd_instance: - image_family: freebsd-15-0-snap - setup_script: - - pkg install -y libnghttp2 curl - - curl https://sh.rustup.rs -sSf --output rustup.sh - - sh rustup.sh -y --default-toolchain nightly --profile=minimal - - . $HOME/.cargo/env test_script: - . $HOME/.cargo/env - LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd