diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index d42b503..590f34c 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -11,7 +11,6 @@ env: CARGO_BUILD_JOBS: "2" CARGO_INCREMENTAL: "0" RUST_TEST_THREADS: "2" - RUSTUP_MAX_RETRIES: "3" TESTCONTAINERS_RYUK_DISABLED: "true" jobs: @@ -23,15 +22,16 @@ jobs: - name: Checkout uses: actions/checkout@v5 - - name: Prepare Rust toolchain + - name: Check Rust toolchain is preinstalled run: | rustup --version rustup toolchain list - timeout 10m rustup toolchain install 1.85.0 \ - --profile minimal \ - --component clippy \ - --component rustfmt \ - --no-self-update + rustup toolchain list | grep -F '1.85.0' >/dev/null || { + echo 'Rust 1.85.0 is not installed in the Gitea runner image.' >&2 + echo 'Install it on the runner image/host before running CI:' >&2 + echo 'rustup toolchain install 1.85.0 --profile minimal --component clippy --component rustfmt' >&2 + exit 1 + } rustup component list --toolchain 1.85.0 --installed - name: Verify runner toolchain @@ -116,15 +116,16 @@ jobs: - name: Checkout uses: actions/checkout@v5 - - name: Prepare Rust toolchain + - name: Check Rust toolchain is preinstalled run: | rustup --version rustup toolchain list - timeout 10m rustup toolchain install 1.85.0 \ - --profile minimal \ - --component clippy \ - --component rustfmt \ - --no-self-update + rustup toolchain list | grep -F '1.85.0' >/dev/null || { + echo 'Rust 1.85.0 is not installed in the Gitea runner image.' >&2 + echo 'Install it on the runner image/host before running CI:' >&2 + echo 'rustup toolchain install 1.85.0 --profile minimal --component clippy --component rustfmt' >&2 + exit 1 + } rustup component list --toolchain 1.85.0 --installed - name: Verify runner toolchain diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 198b297..2e61a89 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -13,7 +13,6 @@ env: MCP_SERVER_IMAGE: git.itexp.me/bsodfather/crank-community-mcp-server UI_IMAGE: git.itexp.me/bsodfather/crank-community-ui OPENBAO_ENV_FILE: .openbao-env - RUSTUP_MAX_RETRIES: "3" jobs: release: @@ -23,15 +22,16 @@ jobs: - name: Checkout uses: actions/checkout@v5 - - name: Prepare Rust toolchain + - name: Check Rust toolchain is preinstalled run: | rustup --version rustup toolchain list - timeout 10m rustup toolchain install 1.85.0 \ - --profile minimal \ - --component clippy \ - --component rustfmt \ - --no-self-update + rustup toolchain list | grep -F '1.85.0' >/dev/null || { + echo 'Rust 1.85.0 is not installed in the Gitea runner image.' >&2 + echo 'Install it on the runner image/host before running CI:' >&2 + echo 'rustup toolchain install 1.85.0 --profile minimal --component clippy --component rustfmt' >&2 + exit 1 + } rustup component list --toolchain 1.85.0 --installed - name: Verify runner toolchain