Skip to content

Commit

Permalink
Re-enable nightly checks and add new dependency duplicate (#3525)
Browse files Browse the repository at this point in the history
# Objective

- Nightly checks where disabled because of a bug in Rust
- Dependency checks are failing because of a new duplicate

## Solution

- Now that rust-lang/rust#92175 has been merged, re-enable nightly checks
- Add the new duplicate dependency to the known list
- Removed `Inflector` dependency as it's not used anymore


Co-authored-by: François <[email protected]>
  • Loading branch information
mockersf and mockersf committed Jan 2, 2022
1 parent e43e366 commit 363bdf7
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 34 deletions.
6 changes: 3 additions & 3 deletions .github/bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ status = [
"build (stable, windows-latest)",
"build (stable, ubuntu-latest)",
"build (stable, macos-latest)",
# "build (nightly, ubuntu-latest)",
"build (nightly, ubuntu-latest)",
"build-wasm (stable, ubuntu-latest)",
# "build-wasm (nightly, ubuntu-latest)",
"build-wasm (nightly, ubuntu-latest)",
"build-android",
"markdownlint",
"check-markdown-links",
"run-examples",
"check-doc",
"check-missing-examples-in-docs",
# "check-unused-dependencies",
"check-unused-dependencies",
"ci",
"check-benches",
]
Expand Down
56 changes: 26 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ jobs:
build:
strategy:
matrix:
# TODO: re-enable nightly checks
# toolchain: [stable, nightly]
toolchain: [stable]
toolchain: [stable, nightly]
os: [windows-latest, ubuntu-latest, macos-latest]
exclude:
- os: macos-latest
Expand Down Expand Up @@ -98,9 +96,7 @@ jobs:
build-wasm:
strategy:
matrix:
# TODO: re-enable nightly checks
# toolchain: [stable, nightly]
toolchain: [stable]
toolchain: [stable, nightly]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -294,27 +290,27 @@ jobs:
file-types: '[".rs"]'
exclude-folders: '["./examples/ios"]'
exclude-files: '[]'
# TODO: re-enable nightly checks
# check-unused-dependencies:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2
# - uses: actions/cache@v2
# with:
# path: |
# ~/.cargo/bin/
# ~/.cargo/registry/index/
# ~/.cargo/registry/cache/
# ~/.cargo/git/db/
# target/
# key: ${{ runner.os }}-cargo-check-unused-dependencies-${{ hashFiles('**/Cargo.toml') }}
# - uses: actions-rs/toolchain@v1
# with:
# toolchain: nightly
# override: true
# - name: Installs cargo-udeps
# run: cargo install --force cargo-udeps
# - name: Install alsa and udev
# run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
# - name: Run cargo udeps
# run: cargo udeps

check-unused-dependencies:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-check-unused-dependencies-${{ hashFiles('**/Cargo.toml') }}
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
override: true
- name: Installs cargo-udeps
run: cargo install --force cargo-udeps
- name: Install alsa and udev
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
- name: Run cargo udeps
run: cargo udeps
1 change: 0 additions & 1 deletion crates/bevy_derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ proc-macro = true
[dependencies]
bevy_macro_utils = { path = "../bevy_macro_utils", version = "0.5.0" }

Inflector = { version = "0.11.4", default-features = false }
quote = "1.0"
syn = "1.0"
1 change: 1 addition & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ skip = [
{ name = "ndk-macro", version = "0.2" }, # from rodio v0.14.0
{ name = "ndk-glue", version = "0.3" }, # from rodio v0.14.0
{ name = "ndk-glue", version = "0.4" }, # from rodio v0.14.0
{ name = "nix", version = "0.20" }, # from rodio v0.14.0
{ name = "proc-macro-crate", version = "0.1" }, # from rodio v0.14.0
{ name = "stdweb", version = "0.1" }, # from rodio v0.14.0
{ name = "strsim", version = "0.9" }, # from rodio v0.14.0
Expand Down

0 comments on commit 363bdf7

Please sign in to comment.