From e7f9a1adeda5b47e8adad3b1df9831470ec88588 Mon Sep 17 00:00:00 2001 From: oech3 <79379754+oech3@users.noreply.github.com> Date: Fri, 18 Sep 2026 01:50:25 +0900 Subject: [PATCH] freebsd.yml: drop rustup & use system openssl --- .github/workflows/freebsd.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index a935bbcf345..f1394f8c1a7 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -41,7 +41,7 @@ jobs: sync: rsync copyback: false # We need jq and GNU coreutils to run show-utils.sh and bash to use inline shell string replacement - prepare: pkg install -y curl sudo jaq coreutils bash python3 + prepare: pkg install -y rust sudo jaq coreutils bash python3 run: | ## Prepare, build, and test sudo ln -s $(command -v jaq) /usr/local/bin/jq @@ -62,9 +62,6 @@ jobs: sudo -i -u ${TEST_USER} bash << EOF set -e whoami - curl https://sh.rustup.rs -sSf --output rustup.sh - sh rustup.sh -y -c rustfmt,clippy --profile=minimal -t stable - . ${HOME}/.cargo/env ## VARs setup cd "${WORKSPACE}" unset FAIL_ON_FAULT ; case '${{ env.STYLE_FAIL_ON_FAULT }}' in @@ -134,7 +131,7 @@ jobs: usesh: true sync: rsync copyback: false - prepare: pkg install -y curl gmake sudo jaq + prepare: pkg install -y gmake nextest rust sudo jaq run: | ## Prepare, build, and test sudo ln -s $(command -v jaq) /usr/local/bin/jq @@ -158,12 +155,6 @@ jobs: sudo -i -u ${TEST_USER} sh << EOF set -e whoami - curl https://sh.rustup.rs -sSf --output rustup.sh - sh rustup.sh -y --profile=minimal - . $HOME/.cargo/env - # Install nextest - mkdir -p ~/.cargo/bin - curl -LsSf https://get.nexte.st/latest/freebsd | tar zxf - -C ~/.cargo/bin ## Info # environment echo "## environment" @@ -185,6 +176,8 @@ jobs: unset FAULT export CARGO_INCREMENTAL=0 export RUSTFLAGS="-C strip=symbols" # for disk space + # vendored OpenSSL takes many times to build. Use system one (LibreSSL is supported). + export OPENSSL_NO_VENDOR=1 OPENSSL_DIR=/usr cargo build || FAULT=1 export PATH=~/.cargo/bin:${PATH} export RUST_BACKTRACE=1