From 36c392be83b5d7a89b85c00fb8a0b9c81eef5247 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Tue, 18 Jan 2022 10:02:08 +0800 Subject: [PATCH 1/6] ci: Fix rust toolchain not fixed correctly Signed-off-by: Xuanwo --- .github/actions/build_debug/action.yml | 3 +-- .github/actions/build_release/action.yml | 3 +-- .github/actions/check/action.yml | 3 +-- .github/actions/test_proxy_mode/action.yml | 3 +-- .github/actions/test_stateful_standalone/action.yml | 3 +-- .github/actions/test_stateless_cluster/action.yml | 3 +-- .github/actions/test_stateless_standalone/action.yml | 3 +-- .github/actions/test_unit/action.yml | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/actions/build_debug/action.yml b/.github/actions/build_debug/action.yml index 53c0584e59563..2ceedb10b2399 100644 --- a/.github/actions/build_debug/action.yml +++ b/.github/actions/build_debug/action.yml @@ -18,8 +18,7 @@ runs: - uses: actions-rs/toolchain@v1 with: target: ${{ matrix.config.target }} - toolchain: nightly - override: true + default: true components: rustfmt, clippy # If you need to reset the cache version, increment the number after `v` diff --git a/.github/actions/build_release/action.yml b/.github/actions/build_release/action.yml index 7c2e8e55d28bb..72914b3077b76 100644 --- a/.github/actions/build_release/action.yml +++ b/.github/actions/build_release/action.yml @@ -18,8 +18,7 @@ runs: - uses: actions-rs/toolchain@v1 with: target: ${{ matrix.config.target }} - toolchain: nightly - override: true + default: true components: rustfmt, clippy # If you need to reset the cache version, increment the number after `v` diff --git a/.github/actions/check/action.yml b/.github/actions/check/action.yml index 6462352ad42c9..53a82666ce384 100644 --- a/.github/actions/check/action.yml +++ b/.github/actions/check/action.yml @@ -17,8 +17,7 @@ runs: - uses: actions-rs/toolchain@v1 with: - toolchain: nightly - override: true + default: true components: rustfmt, clippy # If you need to reset the cache version, increment the number after `v` diff --git a/.github/actions/test_proxy_mode/action.yml b/.github/actions/test_proxy_mode/action.yml index 671d35fa79bfb..cb7f01e6acb4b 100644 --- a/.github/actions/test_proxy_mode/action.yml +++ b/.github/actions/test_proxy_mode/action.yml @@ -13,9 +13,8 @@ runs: - uses: actions-rs/toolchain@v1 with: - toolchain: nightly target: ${{ matrix.config.target }} - override: true + default: true # If you need to reset the cache version, increment the number after `v` - uses: Swatinem/rust-cache@v1 diff --git a/.github/actions/test_stateful_standalone/action.yml b/.github/actions/test_stateful_standalone/action.yml index fa2ec85f09a36..3b7da5e2e89f0 100644 --- a/.github/actions/test_stateful_standalone/action.yml +++ b/.github/actions/test_stateful_standalone/action.yml @@ -13,8 +13,7 @@ runs: - uses: actions-rs/toolchain@v1 with: - toolchain: nightly - override: true + default: true target: ${{ matrix.config.target }} # If you need to reset the cache version, increment the number after `v` diff --git a/.github/actions/test_stateless_cluster/action.yml b/.github/actions/test_stateless_cluster/action.yml index 0978f926adc6b..358a2f6b2b227 100644 --- a/.github/actions/test_stateless_cluster/action.yml +++ b/.github/actions/test_stateless_cluster/action.yml @@ -13,8 +13,7 @@ runs: - uses: actions-rs/toolchain@v1 with: - toolchain: nightly - override: true + default: true target: ${{ matrix.config.target }} # If you need to reset the cache version, increment the number after `v` diff --git a/.github/actions/test_stateless_standalone/action.yml b/.github/actions/test_stateless_standalone/action.yml index aa047fd77d360..6cc001f440ab7 100644 --- a/.github/actions/test_stateless_standalone/action.yml +++ b/.github/actions/test_stateless_standalone/action.yml @@ -13,9 +13,8 @@ runs: - uses: actions-rs/toolchain@v1 with: - toolchain: nightly target: ${{ matrix.config.target }} - override: true + default: true # If you need to reset the cache version, increment the number after `v` - uses: Swatinem/rust-cache@v1 diff --git a/.github/actions/test_unit/action.yml b/.github/actions/test_unit/action.yml index 53da666ce7238..07a65e39f6164 100644 --- a/.github/actions/test_unit/action.yml +++ b/.github/actions/test_unit/action.yml @@ -21,8 +21,7 @@ runs: - uses: actions-rs/toolchain@v1 with: target: ${{ matrix.config.target }} - toolchain: nightly - override: true + default: true components: rustfmt, clippy # If you need to reset the cache version, increment the number after `v` From 6feb9151d915a4b4ed0ad21b75d01669df40d3cc Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Tue, 18 Jan 2022 10:19:25 +0800 Subject: [PATCH 2/6] Use rust-toolchain instead Signed-off-by: Xuanwo --- .gitignore | 2 +- .licenserc.yaml | 2 +- Makefile | 2 +- docker/build-tool/Dockerfile | 4 ++-- rust-toolchain.toml => rust-toolchain | 0 scripts/setup/dev_setup.sh | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) rename rust-toolchain.toml => rust-toolchain (100%) diff --git a/.gitignore b/.gitignore index bacf93eaa758f..fa2f34f242007 100644 --- a/.gitignore +++ b/.gitignore @@ -49,7 +49,7 @@ hfuzz_workspace/ *.stdout-e tests/perfs/*-result.json docker/build-tool/dev_setup.sh -docker/build-tool/rust-toolchain.toml +docker/build-tool/rust-toolchain # python venv/ diff --git a/.licenserc.yaml b/.licenserc.yaml index cee297cc97d74..e0244cb188ad2 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -26,7 +26,7 @@ header: - "**/*.md" - "**/*.json" - "**/*.sql" - - "rust-toolchain.toml" + - "rust-toolchain" - "rustfmt.toml" - "**/*.proto" - ".cargo" diff --git a/Makefile b/Makefile index 230d5c5ce9c80..675462aee7d5e 100644 --- a/Makefile +++ b/Makefile @@ -157,7 +157,7 @@ perf-tool: build-perf-tool docker buildx build . -f ./docker/perf-tool/Dockerfile --platform linux/amd64 --allow network.host --builder host -t ${HUB}/perf-tool:${TAG} --push # used for the build of dev container dev-container: - cp ./rust-toolchain.toml ./docker/build-tool + cp ./rust-toolchain ./docker/build-tool docker build ./docker/build-tool -t ${HUB}/dev-container:${TAG} -f ./docker/build-tool/Dockerfile profile: bash ./scripts/ci/ci-run-profile.sh diff --git a/docker/build-tool/Dockerfile b/docker/build-tool/Dockerfile index 03fe626f99628..4b34d28eee85c 100644 --- a/docker/build-tool/Dockerfile +++ b/docker/build-tool/Dockerfile @@ -1,6 +1,6 @@ FROM debian:buster COPY ./dev_setup.sh /build_setup.sh -COPY ./rust-toolchain.toml /rust-toolchain.toml +COPY ./rust-toolchain /rust-toolchain ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y && \ apt-get install -yq \ @@ -37,7 +37,7 @@ ENV RUSTUP_HOME=/opt/rust/rustup \ RUN curl https://sh.rustup.rs -sSf |\ env CARGO_HOME=/opt/rust/cargo \ sh -s -- -y --default-toolchain stable --profile minimal --no-modify-path && \ - export RUST_VERSION="$(awk -F'[ ="]+' '$1 == "channel" { print $2 }' /rust-toolchain.toml)" && \ + export RUST_VERSION="$(awk -F'[ ="]+' '$1 == "channel" { print $2 }' /rust-toolchain)" && \ env CARGO_HOME=/opt/rust/cargo rustup install $RUST_VERSION && \ env CARGO_HOME=/opt/rust/cargo rustup set profile minimal && \ env CARGO_HOME=/opt/rust/cargo rustup component add rustfmt rust-src clippy miri --toolchain $RUST_VERSION && \ diff --git a/rust-toolchain.toml b/rust-toolchain similarity index 100% rename from rust-toolchain.toml rename to rust-toolchain diff --git a/scripts/setup/dev_setup.sh b/scripts/setup/dev_setup.sh index c1adc8a433e4d..30f9e219e09e4 100755 --- a/scripts/setup/dev_setup.sh +++ b/scripts/setup/dev_setup.sh @@ -228,7 +228,7 @@ if [[ "$INSTALL_BUILD_TOOLS" == "false" ]] && INSTALL_BUILD_TOOLS="true" fi -if [ ! -f rust-toolchain.toml ]; then +if [ ! -f rust-toolchain ]; then echo "Unknown location. Please run this from the databend repository. Abort." exit 1 fi @@ -343,7 +343,7 @@ if [[ "$INSTALL_BUILD_TOOLS" == "true" ]]; then install_rustup "$BATCH_MODE" - install_toolchain "$(awk -F'[ ="]+' '$1 == "channel" { print $2 }' rust-toolchain.toml)" + install_toolchain "$(awk -F'[ ="]+' '$1 == "channel" { print $2 }' rust-toolchain)" install_pkg lcov "$PACKAGE_MANAGER" fi From 81facca3d0705ddfa1e6dd8bf2e77ee51461bd9e Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Tue, 18 Jan 2022 10:30:37 +0800 Subject: [PATCH 3/6] Revert "Use rust-toolchain instead" This reverts commit 6feb9151d915a4b4ed0ad21b75d01669df40d3cc. --- .gitignore | 2 +- .licenserc.yaml | 2 +- Makefile | 2 +- docker/build-tool/Dockerfile | 4 ++-- rust-toolchain => rust-toolchain.toml | 0 scripts/setup/dev_setup.sh | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) rename rust-toolchain => rust-toolchain.toml (100%) diff --git a/.gitignore b/.gitignore index fa2f34f242007..bacf93eaa758f 100644 --- a/.gitignore +++ b/.gitignore @@ -49,7 +49,7 @@ hfuzz_workspace/ *.stdout-e tests/perfs/*-result.json docker/build-tool/dev_setup.sh -docker/build-tool/rust-toolchain +docker/build-tool/rust-toolchain.toml # python venv/ diff --git a/.licenserc.yaml b/.licenserc.yaml index e0244cb188ad2..cee297cc97d74 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -26,7 +26,7 @@ header: - "**/*.md" - "**/*.json" - "**/*.sql" - - "rust-toolchain" + - "rust-toolchain.toml" - "rustfmt.toml" - "**/*.proto" - ".cargo" diff --git a/Makefile b/Makefile index 675462aee7d5e..230d5c5ce9c80 100644 --- a/Makefile +++ b/Makefile @@ -157,7 +157,7 @@ perf-tool: build-perf-tool docker buildx build . -f ./docker/perf-tool/Dockerfile --platform linux/amd64 --allow network.host --builder host -t ${HUB}/perf-tool:${TAG} --push # used for the build of dev container dev-container: - cp ./rust-toolchain ./docker/build-tool + cp ./rust-toolchain.toml ./docker/build-tool docker build ./docker/build-tool -t ${HUB}/dev-container:${TAG} -f ./docker/build-tool/Dockerfile profile: bash ./scripts/ci/ci-run-profile.sh diff --git a/docker/build-tool/Dockerfile b/docker/build-tool/Dockerfile index 4b34d28eee85c..03fe626f99628 100644 --- a/docker/build-tool/Dockerfile +++ b/docker/build-tool/Dockerfile @@ -1,6 +1,6 @@ FROM debian:buster COPY ./dev_setup.sh /build_setup.sh -COPY ./rust-toolchain /rust-toolchain +COPY ./rust-toolchain.toml /rust-toolchain.toml ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y && \ apt-get install -yq \ @@ -37,7 +37,7 @@ ENV RUSTUP_HOME=/opt/rust/rustup \ RUN curl https://sh.rustup.rs -sSf |\ env CARGO_HOME=/opt/rust/cargo \ sh -s -- -y --default-toolchain stable --profile minimal --no-modify-path && \ - export RUST_VERSION="$(awk -F'[ ="]+' '$1 == "channel" { print $2 }' /rust-toolchain)" && \ + export RUST_VERSION="$(awk -F'[ ="]+' '$1 == "channel" { print $2 }' /rust-toolchain.toml)" && \ env CARGO_HOME=/opt/rust/cargo rustup install $RUST_VERSION && \ env CARGO_HOME=/opt/rust/cargo rustup set profile minimal && \ env CARGO_HOME=/opt/rust/cargo rustup component add rustfmt rust-src clippy miri --toolchain $RUST_VERSION && \ diff --git a/rust-toolchain b/rust-toolchain.toml similarity index 100% rename from rust-toolchain rename to rust-toolchain.toml diff --git a/scripts/setup/dev_setup.sh b/scripts/setup/dev_setup.sh index 30f9e219e09e4..c1adc8a433e4d 100755 --- a/scripts/setup/dev_setup.sh +++ b/scripts/setup/dev_setup.sh @@ -228,7 +228,7 @@ if [[ "$INSTALL_BUILD_TOOLS" == "false" ]] && INSTALL_BUILD_TOOLS="true" fi -if [ ! -f rust-toolchain ]; then +if [ ! -f rust-toolchain.toml ]; then echo "Unknown location. Please run this from the databend repository. Abort." exit 1 fi @@ -343,7 +343,7 @@ if [[ "$INSTALL_BUILD_TOOLS" == "true" ]]; then install_rustup "$BATCH_MODE" - install_toolchain "$(awk -F'[ ="]+' '$1 == "channel" { print $2 }' rust-toolchain)" + install_toolchain "$(awk -F'[ ="]+' '$1 == "channel" { print $2 }' rust-toolchain.toml)" install_pkg lcov "$PACKAGE_MANAGER" fi From ef40f0133dc1cbbe6af63cdc245cc956151ffab8 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Tue, 18 Jan 2022 10:46:05 +0800 Subject: [PATCH 4/6] Use forked version Signed-off-by: Xuanwo --- .github/actions/check/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/check/action.yml b/.github/actions/check/action.yml index 53a82666ce384..f59a76e8e982c 100644 --- a/.github/actions/check/action.yml +++ b/.github/actions/check/action.yml @@ -15,7 +15,9 @@ runs: version: '3.x' repo-token: ${{ inputs.github_token }} - - uses: actions-rs/toolchain@v1 + # Use forked version of action-rs to fix rust-toolchain.toml not supported. + # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. + - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 with: default: true components: rustfmt, clippy From 832f208505fc4ee5082e94cf08af8fe08191f452 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Tue, 18 Jan 2022 11:16:06 +0800 Subject: [PATCH 5/6] Apply to all actions Signed-off-by: Xuanwo --- .github/actions/build_debug/action.yml | 4 +++- .github/actions/build_release/action.yml | 4 +++- .github/actions/test_proxy_mode/action.yml | 4 +++- .github/actions/test_stateful_standalone/action.yml | 4 +++- .github/actions/test_stateless_cluster/action.yml | 4 +++- .github/actions/test_stateless_standalone/action.yml | 4 +++- .github/actions/test_unit/action.yml | 4 +++- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.github/actions/build_debug/action.yml b/.github/actions/build_debug/action.yml index 2ceedb10b2399..98f88e12f1784 100644 --- a/.github/actions/build_debug/action.yml +++ b/.github/actions/build_debug/action.yml @@ -15,7 +15,9 @@ runs: version: '3.x' repo-token: ${{ inputs.github_token }} - - uses: actions-rs/toolchain@v1 + # Use forked version of action-rs to fix rust-toolchain.toml not supported. + # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. + - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 with: target: ${{ matrix.config.target }} default: true diff --git a/.github/actions/build_release/action.yml b/.github/actions/build_release/action.yml index 72914b3077b76..0b24fc9ebc7de 100644 --- a/.github/actions/build_release/action.yml +++ b/.github/actions/build_release/action.yml @@ -15,7 +15,9 @@ runs: version: '3.x' repo-token: ${{ inputs.github_token }} - - uses: actions-rs/toolchain@v1 + # Use forked version of action-rs to fix rust-toolchain.toml not supported. + # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. + - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 with: target: ${{ matrix.config.target }} default: true diff --git a/.github/actions/test_proxy_mode/action.yml b/.github/actions/test_proxy_mode/action.yml index cb7f01e6acb4b..f8baeb253dd67 100644 --- a/.github/actions/test_proxy_mode/action.yml +++ b/.github/actions/test_proxy_mode/action.yml @@ -11,7 +11,9 @@ runs: - name: Maximize build space uses: ./.github/actions/cleanup - - uses: actions-rs/toolchain@v1 + # Use forked version of action-rs to fix rust-toolchain.toml not supported. + # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. + - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 with: target: ${{ matrix.config.target }} default: true diff --git a/.github/actions/test_stateful_standalone/action.yml b/.github/actions/test_stateful_standalone/action.yml index 3b7da5e2e89f0..97764049b7c7d 100644 --- a/.github/actions/test_stateful_standalone/action.yml +++ b/.github/actions/test_stateful_standalone/action.yml @@ -11,7 +11,9 @@ runs: - name: Maximize build space uses: ./.github/actions/cleanup - - uses: actions-rs/toolchain@v1 + # Use forked version of action-rs to fix rust-toolchain.toml not supported. + # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. + - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 with: default: true target: ${{ matrix.config.target }} diff --git a/.github/actions/test_stateless_cluster/action.yml b/.github/actions/test_stateless_cluster/action.yml index 358a2f6b2b227..24656df23faf1 100644 --- a/.github/actions/test_stateless_cluster/action.yml +++ b/.github/actions/test_stateless_cluster/action.yml @@ -11,7 +11,9 @@ runs: - name: Maximize build space uses: ./.github/actions/cleanup - - uses: actions-rs/toolchain@v1 + # Use forked version of action-rs to fix rust-toolchain.toml not supported. + # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. + - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 with: default: true target: ${{ matrix.config.target }} diff --git a/.github/actions/test_stateless_standalone/action.yml b/.github/actions/test_stateless_standalone/action.yml index 6cc001f440ab7..106b331e6f349 100644 --- a/.github/actions/test_stateless_standalone/action.yml +++ b/.github/actions/test_stateless_standalone/action.yml @@ -11,7 +11,9 @@ runs: - name: Maximize build space uses: ./.github/actions/cleanup - - uses: actions-rs/toolchain@v1 + # Use forked version of action-rs to fix rust-toolchain.toml not supported. + # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. + - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 with: target: ${{ matrix.config.target }} default: true diff --git a/.github/actions/test_unit/action.yml b/.github/actions/test_unit/action.yml index 07a65e39f6164..32f6cef3c1b61 100644 --- a/.github/actions/test_unit/action.yml +++ b/.github/actions/test_unit/action.yml @@ -18,7 +18,9 @@ runs: version: '3.x' repo-token: ${{ inputs.github_token }} - - uses: actions-rs/toolchain@v1 + # Use forked version of action-rs to fix rust-toolchain.toml not supported. + # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. + - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 with: target: ${{ matrix.config.target }} default: true From 3a8767265497840dbc1aced2fbd2365a923fd667 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Tue, 18 Jan 2022 11:26:56 +0800 Subject: [PATCH 6/6] Use native rustup instead Signed-off-by: Xuanwo --- .github/actions/build_debug/action.yml | 10 +++------- .github/actions/build_release/action.yml | 10 +++------- .github/actions/check/action.yml | 7 ------- .github/actions/test_proxy_mode/action.yml | 9 +++------ .github/actions/test_stateful_standalone/action.yml | 9 +++------ .github/actions/test_stateless_cluster/action.yml | 9 +++------ .github/actions/test_stateless_standalone/action.yml | 9 +++------ .github/actions/test_unit/action.yml | 8 -------- 8 files changed, 18 insertions(+), 53 deletions(-) diff --git a/.github/actions/build_debug/action.yml b/.github/actions/build_debug/action.yml index 98f88e12f1784..b7b1202666d0e 100644 --- a/.github/actions/build_debug/action.yml +++ b/.github/actions/build_debug/action.yml @@ -15,13 +15,9 @@ runs: version: '3.x' repo-token: ${{ inputs.github_token }} - # Use forked version of action-rs to fix rust-toolchain.toml not supported. - # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. - - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 - with: - target: ${{ matrix.config.target }} - default: true - components: rustfmt, clippy + - name: Add rust target + shell: bash + run: rustup target add ${{ matrix.config.target }} # If you need to reset the cache version, increment the number after `v` - uses: Swatinem/rust-cache@v1 diff --git a/.github/actions/build_release/action.yml b/.github/actions/build_release/action.yml index 0b24fc9ebc7de..57b85b8757bd8 100644 --- a/.github/actions/build_release/action.yml +++ b/.github/actions/build_release/action.yml @@ -15,13 +15,9 @@ runs: version: '3.x' repo-token: ${{ inputs.github_token }} - # Use forked version of action-rs to fix rust-toolchain.toml not supported. - # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. - - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 - with: - target: ${{ matrix.config.target }} - default: true - components: rustfmt, clippy + - name: Add rust target + shell: bash + run: rustup target add ${{ matrix.config.target }} # If you need to reset the cache version, increment the number after `v` - uses: Swatinem/rust-cache@v1 diff --git a/.github/actions/check/action.yml b/.github/actions/check/action.yml index f59a76e8e982c..0b5d5b29e5a5e 100644 --- a/.github/actions/check/action.yml +++ b/.github/actions/check/action.yml @@ -15,13 +15,6 @@ runs: version: '3.x' repo-token: ${{ inputs.github_token }} - # Use forked version of action-rs to fix rust-toolchain.toml not supported. - # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. - - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 - with: - default: true - components: rustfmt, clippy - # If you need to reset the cache version, increment the number after `v` - uses: Swatinem/rust-cache@v1 with: diff --git a/.github/actions/test_proxy_mode/action.yml b/.github/actions/test_proxy_mode/action.yml index f8baeb253dd67..07b61e57e10ec 100644 --- a/.github/actions/test_proxy_mode/action.yml +++ b/.github/actions/test_proxy_mode/action.yml @@ -11,12 +11,9 @@ runs: - name: Maximize build space uses: ./.github/actions/cleanup - # Use forked version of action-rs to fix rust-toolchain.toml not supported. - # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. - - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 - with: - target: ${{ matrix.config.target }} - default: true + - name: Add rust target + shell: bash + run: rustup target add ${{ matrix.config.target }} # If you need to reset the cache version, increment the number after `v` - uses: Swatinem/rust-cache@v1 diff --git a/.github/actions/test_stateful_standalone/action.yml b/.github/actions/test_stateful_standalone/action.yml index 97764049b7c7d..c3b83d490cde0 100644 --- a/.github/actions/test_stateful_standalone/action.yml +++ b/.github/actions/test_stateful_standalone/action.yml @@ -11,12 +11,9 @@ runs: - name: Maximize build space uses: ./.github/actions/cleanup - # Use forked version of action-rs to fix rust-toolchain.toml not supported. - # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. - - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 - with: - default: true - target: ${{ matrix.config.target }} + - name: Add rust target + shell: bash + run: rustup target add ${{ matrix.config.target }} # If you need to reset the cache version, increment the number after `v` - uses: Swatinem/rust-cache@v1 diff --git a/.github/actions/test_stateless_cluster/action.yml b/.github/actions/test_stateless_cluster/action.yml index 24656df23faf1..210485f7e9824 100644 --- a/.github/actions/test_stateless_cluster/action.yml +++ b/.github/actions/test_stateless_cluster/action.yml @@ -11,12 +11,9 @@ runs: - name: Maximize build space uses: ./.github/actions/cleanup - # Use forked version of action-rs to fix rust-toolchain.toml not supported. - # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. - - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 - with: - default: true - target: ${{ matrix.config.target }} + - name: Add rust target + shell: bash + run: rustup target add ${{ matrix.config.target }} # If you need to reset the cache version, increment the number after `v` - uses: Swatinem/rust-cache@v1 diff --git a/.github/actions/test_stateless_standalone/action.yml b/.github/actions/test_stateless_standalone/action.yml index 106b331e6f349..678587fe619b9 100644 --- a/.github/actions/test_stateless_standalone/action.yml +++ b/.github/actions/test_stateless_standalone/action.yml @@ -11,12 +11,9 @@ runs: - name: Maximize build space uses: ./.github/actions/cleanup - # Use forked version of action-rs to fix rust-toolchain.toml not supported. - # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. - - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 - with: - target: ${{ matrix.config.target }} - default: true + - name: Add rust target + shell: bash + run: rustup target add ${{ matrix.config.target }} # If you need to reset the cache version, increment the number after `v` - uses: Swatinem/rust-cache@v1 diff --git a/.github/actions/test_unit/action.yml b/.github/actions/test_unit/action.yml index 32f6cef3c1b61..16ffa7409be14 100644 --- a/.github/actions/test_unit/action.yml +++ b/.github/actions/test_unit/action.yml @@ -18,14 +18,6 @@ runs: version: '3.x' repo-token: ${{ inputs.github_token }} - # Use forked version of action-rs to fix rust-toolchain.toml not supported. - # Should be removed after https://github.com/actions-rs/toolchain/pull/209 get merged. - - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 - with: - target: ${{ matrix.config.target }} - default: true - components: rustfmt, clippy - # If you need to reset the cache version, increment the number after `v` - uses: Swatinem/rust-cache@v1 with: