forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate away from actions-rs actions to dtolnay/rust-toolchain (#6432)

Browse Source 
# Objective

- actions from actions-rs are outdated and use deprecated function
- They haven't been updated for the last two years (https://github.com/actions-rs/toolchain)

## Solution

- use the newer and up-to-date https://github.com/dtolnay/rust-toolchain
This commit is contained in:
François 2022-10-31 17:36:23 +00:00
parent 55b3cb0183
commit 89b3422f62
4 changed files with 19 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.github/workflows/ci.yml vendored
View File

@ -28,10 +28,7 @@ jobs:
~/.cargo/git/db/ ~/.cargo/git/db/
target/ target/
key: ${{ runner.os }}-cargo-build-stable-${{ hashFiles('**/Cargo.toml') }} key: ${{ runner.os }}-cargo-build-stable-${{ hashFiles('**/Cargo.toml') }}
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
- name: Install alsa and udev - name: Install alsa and udev
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
if: runner.os == 'linux' if: runner.os == 'linux'
@ -55,11 +52,9 @@ jobs:
~/.cargo/git/db/ ~/.cargo/git/db/
target/ target/
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('**/Cargo.toml') }} key: ${{ runner.os }}-cargo-ci-${{ hashFiles('**/Cargo.toml') }}
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with: with:
toolchain: stable
components: rustfmt, clippy components: rustfmt, clippy
override: true
- name: Install alsa and udev - name: Install alsa and udev
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
- name: CI job - name: CI job
@ -80,11 +75,10 @@ jobs:
~/.cargo/git/db/ ~/.cargo/git/db/
target/ target/
key: ${{ runner.os }}-cargo-miri-${{ hashFiles('**/Cargo.toml') }} key: ${{ runner.os }}-cargo-miri-${{ hashFiles('**/Cargo.toml') }}
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.NIGHTLY_TOOLCHAIN }} toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
components: miri components: miri
override: true
- name: Install alsa and udev - name: Install alsa and udev
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
- name: CI job - name: CI job
@ -115,7 +109,7 @@ jobs:
target/ target/
crates/bevy_ecs_compile_fail_tests/target/ crates/bevy_ecs_compile_fail_tests/target/
key: ${{ runner.os }}-cargo-check-compiles-${{ hashFiles('**/Cargo.toml') }} key: ${{ runner.os }}-cargo-check-compiles-${{ hashFiles('**/Cargo.toml') }}
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with: with:
toolchain: stable toolchain: stable
override: true override: true
@ -139,16 +133,11 @@ jobs:
~/.cargo/git/db/ ~/.cargo/git/db/
target/ target/
key: ubuntu-assets-cargo-build-wasm-stable-${{ hashFiles('**/Cargo.toml') }} key: ubuntu-assets-cargo-build-wasm-stable-${{ hashFiles('**/Cargo.toml') }}
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with: with:
toolchain: stable
target: wasm32-unknown-unknown target: wasm32-unknown-unknown
override: true
- name: Check wasm - name: Check wasm
uses: actions-rs/cargo@v1 run: cargo check --target wasm32-unknown-unknown
with:
command: check
args: --target wasm32-unknown-unknown
markdownlint: markdownlint:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -194,9 +183,7 @@ jobs:
~/.cargo/git/db/ ~/.cargo/git/db/
target/ target/
key: ${{ runner.os }}-cargo-run-examples-${{ hashFiles('**/Cargo.toml') }} key: ${{ runner.os }}-cargo-run-examples-${{ hashFiles('**/Cargo.toml') }}
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- name: Build bevy - name: Build bevy
# this uses the same command as when running the example to ensure build is reused # this uses the same command as when running the example to ensure build is reused
run: | run: |
@ -229,9 +216,7 @@ jobs:
~/.cargo/git/db/ ~/.cargo/git/db/
target/ target/
key: ${{ runner.os }}-check-doc-${{ hashFiles('**/Cargo.toml') }} key: ${{ runner.os }}-check-doc-${{ hashFiles('**/Cargo.toml') }}
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- name: Install alsa and udev - name: Install alsa and udev
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
if: runner.os == 'linux' if: runner.os == 'linux'
@ -280,10 +265,9 @@ jobs:
~/.cargo/git/db/ ~/.cargo/git/db/
target/ target/
key: ${{ runner.os }}-cargo-check-unused-dependencies-${{ hashFiles('**/Cargo.toml') }} key: ${{ runner.os }}-cargo-check-unused-dependencies-${{ hashFiles('**/Cargo.toml') }}
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@master
with: with:
toolchain: ${{ env.NIGHTLY_TOOLCHAIN }} toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
override: true
- name: Installs cargo-udeps - name: Installs cargo-udeps
run: cargo install --force cargo-udeps run: cargo install --force cargo-udeps
- name: Install alsa and udev - name: Install alsa and udev

20
.github/workflows/dependencies.yml vendored
View File

@ -23,10 +23,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
- name: Install cargo-deny - name: Install cargo-deny
run: cargo install cargo-deny run: cargo install cargo-deny
- name: Check for security advisories and unmaintained crates - name: Check for security advisories and unmaintained crates
@ -36,10 +33,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
- name: Install cargo-deny - name: Install cargo-deny
run: cargo install cargo-deny run: cargo install cargo-deny
- name: Check for banned and duplicated dependencies - name: Check for banned and duplicated dependencies
@ -49,10 +43,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
- name: Install cargo-deny - name: Install cargo-deny
run: cargo install cargo-deny run: cargo install cargo-deny
- name: Check for unauthorized licenses - name: Check for unauthorized licenses
@ -62,10 +53,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
- name: Install cargo-deny - name: Install cargo-deny
run: cargo install cargo-deny run: cargo install cargo-deny
- name: Checked for unauthorized crate sources - name: Checked for unauthorized crate sources

6
.github/workflows/docs.yml vendored
View File

@ -17,11 +17,7 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Install Rust - name: Install Rust
uses: actions-rs/toolchain@v1 uses: dtolnay/rust-toolchain@stable
with:
profile: minimal
toolchain: stable
override: true
- name: Install alsa and udev - name: Install alsa and udev
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev

22
.github/workflows/validation-jobs.yml vendored
View File

@ -16,10 +16,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
- uses: actions/cache@v3 - uses: actions/cache@v3
with: with:
@ -38,9 +35,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- uses: actions/cache@v3 - uses: actions/cache@v3
with: with:
@ -67,9 +62,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- uses: actions/cache@v3 - uses: actions/cache@v3
with: with:
@ -103,11 +96,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with: with:
toolchain: stable
target: wasm32-unknown-unknown target: wasm32-unknown-unknown
override: true
- uses: actions/cache@v3 - uses: actions/cache@v3
with: with:
@ -162,10 +153,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1 - uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
- name: Install alsa and udev - name: Install alsa and udev
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
- name: Build - name: Build