Skip to content

Commit

Permalink
Auto merge of #3294 - JohnTitor:freebsd-14-update, r=JohnTitor
Browse files Browse the repository at this point in the history
Disable FreeBSD 14 CI temporarily
  • Loading branch information
bors committed Jul 8, 2023
2 parents 30a7a9f + c704417 commit a6bfb92
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .cirrus.yml
Expand Up @@ -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
Expand Down
14 changes: 10 additions & 4 deletions ci/build.sh
Expand Up @@ -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}"
Expand Down
3 changes: 3 additions & 0 deletions ci/install-rust.sh
Expand Up @@ -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
Expand Down

0 comments on commit a6bfb92

Please sign in to comment.