Skip to content

Commit 363bdf7

Browse files
committed
Re-enable nightly checks and add new dependency duplicate (#3525)
# 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]>
1 parent e43e366 commit 363bdf7

File tree

4 files changed

+30
-34
lines changed

4 files changed

+30
-34
lines changed

.github/bors.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ status = [
22
"build (stable, windows-latest)",
33
"build (stable, ubuntu-latest)",
44
"build (stable, macos-latest)",
5-
# "build (nightly, ubuntu-latest)",
5+
"build (nightly, ubuntu-latest)",
66
"build-wasm (stable, ubuntu-latest)",
7-
# "build-wasm (nightly, ubuntu-latest)",
7+
"build-wasm (nightly, ubuntu-latest)",
88
"build-android",
99
"markdownlint",
1010
"check-markdown-links",
1111
"run-examples",
1212
"check-doc",
1313
"check-missing-examples-in-docs",
14-
# "check-unused-dependencies",
14+
"check-unused-dependencies",
1515
"ci",
1616
"check-benches",
1717
]

.github/workflows/ci.yml

+26-30
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ jobs:
1414
build:
1515
strategy:
1616
matrix:
17-
# TODO: re-enable nightly checks
18-
# toolchain: [stable, nightly]
19-
toolchain: [stable]
17+
toolchain: [stable, nightly]
2018
os: [windows-latest, ubuntu-latest, macos-latest]
2119
exclude:
2220
- os: macos-latest
@@ -98,9 +96,7 @@ jobs:
9896
build-wasm:
9997
strategy:
10098
matrix:
101-
# TODO: re-enable nightly checks
102-
# toolchain: [stable, nightly]
103-
toolchain: [stable]
99+
toolchain: [stable, nightly]
104100
os: [ubuntu-latest]
105101
runs-on: ${{ matrix.os }}
106102
steps:
@@ -294,27 +290,27 @@ jobs:
294290
file-types: '[".rs"]'
295291
exclude-folders: '["./examples/ios"]'
296292
exclude-files: '[]'
297-
# TODO: re-enable nightly checks
298-
# check-unused-dependencies:
299-
# runs-on: ubuntu-latest
300-
# steps:
301-
# - uses: actions/checkout@v2
302-
# - uses: actions/cache@v2
303-
# with:
304-
# path: |
305-
# ~/.cargo/bin/
306-
# ~/.cargo/registry/index/
307-
# ~/.cargo/registry/cache/
308-
# ~/.cargo/git/db/
309-
# target/
310-
# key: ${{ runner.os }}-cargo-check-unused-dependencies-${{ hashFiles('**/Cargo.toml') }}
311-
# - uses: actions-rs/toolchain@v1
312-
# with:
313-
# toolchain: nightly
314-
# override: true
315-
# - name: Installs cargo-udeps
316-
# run: cargo install --force cargo-udeps
317-
# - name: Install alsa and udev
318-
# run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
319-
# - name: Run cargo udeps
320-
# run: cargo udeps
293+
294+
check-unused-dependencies:
295+
runs-on: ubuntu-latest
296+
steps:
297+
- uses: actions/checkout@v2
298+
- uses: actions/cache@v2
299+
with:
300+
path: |
301+
~/.cargo/bin/
302+
~/.cargo/registry/index/
303+
~/.cargo/registry/cache/
304+
~/.cargo/git/db/
305+
target/
306+
key: ${{ runner.os }}-cargo-check-unused-dependencies-${{ hashFiles('**/Cargo.toml') }}
307+
- uses: actions-rs/toolchain@v1
308+
with:
309+
toolchain: nightly
310+
override: true
311+
- name: Installs cargo-udeps
312+
run: cargo install --force cargo-udeps
313+
- name: Install alsa and udev
314+
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
315+
- name: Run cargo udeps
316+
run: cargo udeps

crates/bevy_derive/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ proc-macro = true
1414
[dependencies]
1515
bevy_macro_utils = { path = "../bevy_macro_utils", version = "0.5.0" }
1616

17-
Inflector = { version = "0.11.4", default-features = false }
1817
quote = "1.0"
1918
syn = "1.0"

deny.toml

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ skip = [
5353
{ name = "ndk-macro", version = "0.2" }, # from rodio v0.14.0
5454
{ name = "ndk-glue", version = "0.3" }, # from rodio v0.14.0
5555
{ name = "ndk-glue", version = "0.4" }, # from rodio v0.14.0
56+
{ name = "nix", version = "0.20" }, # from rodio v0.14.0
5657
{ name = "proc-macro-crate", version = "0.1" }, # from rodio v0.14.0
5758
{ name = "stdweb", version = "0.1" }, # from rodio v0.14.0
5859
{ name = "strsim", version = "0.9" }, # from rodio v0.14.0

0 commit comments

Comments
 (0)