From a8e31a998146428c85eb1f760cd62ded5de2bc4f Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sat, 8 Jul 2023 11:06:16 +0900 Subject: [PATCH 1/2] Disable FreeBSD 14 CI temporarily Signed-off-by: Yuki Okushi --- .cirrus.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 24f152846d97f..dcfff67206296 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -29,7 +29,9 @@ task: task: name: nightly x86_64-unknown-freebsd-14 freebsd_instance: - image: freebsd-14-0-current-amd64-v20230330 + # FIXME: FreeBSD 14 CI fails due to pkg installation. + # Use 14 again once a new image is available on Cirrus CI. + image_family: freebsd-13-2 setup_script: - pkg install -y libnghttp2 curl - curl https://sh.rustup.rs -sSf --output rustup.sh From c70441735558857cec783fa82ae6c4ec7657c07d Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sat, 8 Jul 2023 11:50:35 +0900 Subject: [PATCH 2/2] Pin nightly version on MIPS Signed-off-by: Yuki Okushi --- ci/build.sh | 14 ++++++++++---- ci/install-rust.sh | 3 +++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index 2588166e8495b..3a3a00d81caf7 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -10,13 +10,19 @@ set -ex : "${TOOLCHAIN?The TOOLCHAIN environment variable must be set.}" : "${OS?The OS environment variable must be set.}" -RUST=${TOOLCHAIN} +case "$TARGET" in + # FIXME: Unpin once mips' components are available on nightly. + # https://rust-lang.github.io/rustup-components-history/mips-unknown-linux-gnu.html + *mips*) RUST=nightly-2023-07-04;; + *) RUST=${TOOLCHAIN};; +esac echo "Testing Rust ${RUST} on ${OS}" -if [ "${TOOLCHAIN}" = "nightly" ] ; then - rustup component add rust-src -fi +case "$RUST" in + *nightly*) rustup component add rust-src;; + *) ;; +esac test_target() { BUILD_CMD="${1}" diff --git a/ci/install-rust.sh b/ci/install-rust.sh index 5b50c624cbd66..3ce81e6299932 100644 --- a/ci/install-rust.sh +++ b/ci/install-rust.sh @@ -12,6 +12,9 @@ else # https://github.com/rust-lang/rust/issues/103673 contains related information. case "$TARGET" in *android*) toolchain=nightly-2022-10-09;; + # FIXME: Unpin once mips' components are available on nightly. + # https://rust-lang.github.io/rustup-components-history/mips-unknown-linux-gnu.html + *mips*) toolchain=nightly-2023-07-04;; *) toolchain=nightly;; esac fi