diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 72fbf07616bbd..e82fc501e1045 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,3 +12,9 @@ updates: interval: weekly labels: - "C-Dependencies" + - package-ecosystem: rust-toolchain + directory: / + schedule: + interval: daily + labels: + - "C-Build-System" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b687b032e3d13..f21dc6797b17e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,8 @@ jobs: ~/.cargo/git/db/ target/ - uses: dtolnay/rust-toolchain@stable + - name: override + run: rustup override set stable - name: Install Linux dependencies uses: ./.github/actions/install-linux-deps - name: Build & run tests @@ -78,6 +80,8 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: components: rustfmt, clippy + - name: override + run: rustup override set stable - name: Install Linux dependencies uses: ./.github/actions/install-linux-deps with: @@ -110,6 +114,8 @@ jobs: with: toolchain: ${{ env.NIGHTLY_TOOLCHAIN }} components: miri + - name: override + run: rustup override set ${{ env.NIGHTLY_TOOLCHAIN }} - name: CI job # To run the tests one item at a time for troubleshooting, use # cargo --quiet test --lib -- --list | sed 's/: test$//' | MIRIFLAGS="-Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation" xargs -n1 cargo miri test -p bevy_ecs --lib -- --exact @@ -145,6 +151,8 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: toolchain: stable + - name: override + run: rustup override set stable - name: Install Linux dependencies uses: ./.github/actions/install-linux-deps - name: Check Compile @@ -174,6 +182,8 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: targets: x86_64-unknown-none + - name: override + run: rustup override set stable - name: Install Linux dependencies uses: ./.github/actions/install-linux-deps - name: Check Compile @@ -202,6 +212,8 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: targets: thumbv6m-none-eabi + - name: override + run: rustup override set stable - name: Install Linux dependencies uses: ./.github/actions/install-linux-deps - name: Check Compile @@ -230,6 +242,8 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: targets: x86_64-unknown-none + - name: override + run: rustup override set stable - name: Install Linux dependencies uses: ./.github/actions/install-linux-deps - name: Check Compile @@ -258,6 +272,8 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: target: wasm32-unknown-unknown + - name: override + run: rustup override set stable - name: Check wasm env: RUSTFLAGS: --cfg getrandom_backend="wasm_js" @@ -288,6 +304,8 @@ jobs: toolchain: ${{ env.NIGHTLY_TOOLCHAIN }} targets: wasm32-unknown-unknown components: rust-src + - name: override + run: rustup override set ${{ env.NIGHTLY_TOOLCHAIN }} - name: Check wasm run: cargo check --target wasm32-unknown-unknown -Z build-std=std,panic_abort env: diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000000000..d6d33819778ee --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.91.1"