Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-22 20:53:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-enable nightly checks and add new dependency duplicate (#3525)

Browse source 
# Objective

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

## Solution

- Now that https://github.com/rust-lang/rust/pull/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 <8672791+mockersf@users.noreply.github.com>
This commit is contained in:
François 2022-01-02 20:18:53 +00:00
parent e43e36696d
commit 363bdf78dc
4 changed files with 30 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/bors.toml vendored
View file

@ -2,16 +2,16 @@ status = [
"build (stable, windows-latest)", "build (stable, windows-latest)",
"build (stable, ubuntu-latest)", "build (stable, ubuntu-latest)",
"build (stable, macos-latest)", "build (stable, macos-latest)",
# "build (nightly, ubuntu-latest)", "build (nightly, ubuntu-latest)",
"build-wasm (stable, ubuntu-latest)", "build-wasm (stable, ubuntu-latest)",
# "build-wasm (nightly, ubuntu-latest)", "build-wasm (nightly, ubuntu-latest)",
"build-android", "build-android",
"markdownlint", "markdownlint",
"check-markdown-links", "check-markdown-links",
"run-examples", "run-examples",
"check-doc", "check-doc",
"check-missing-examples-in-docs", "check-missing-examples-in-docs",
# "check-unused-dependencies", "check-unused-dependencies",
"ci", "ci",
"check-benches", "check-benches",
] ]

56
.github/workflows/ci.yml vendored
View file

@ -14,9 +14,7 @@ jobs:
build: build:
strategy: strategy:
matrix: matrix:
# TODO: re-enable nightly checks toolchain: [stable, nightly]
# toolchain: [stable, nightly]
toolchain: [stable]
os: [windows-latest, ubuntu-latest, macos-latest] os: [windows-latest, ubuntu-latest, macos-latest]
exclude: exclude:
- os: macos-latest - os: macos-latest
@ -98,9 +96,7 @@ jobs:
build-wasm: build-wasm:
strategy: strategy:
matrix: matrix:
# TODO: re-enable nightly checks toolchain: [stable, nightly]
# toolchain: [stable, nightly]
toolchain: [stable]
os: [ubuntu-latest] os: [ubuntu-latest]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
@ -294,27 +290,27 @@ jobs:
file-types: '[".rs"]' file-types: '[".rs"]'
exclude-folders: '["./examples/ios"]' exclude-folders: '["./examples/ios"]'
exclude-files: '[]' exclude-files: '[]'
# TODO: re-enable nightly checks
# check-unused-dependencies: check-unused-dependencies:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - uses: actions/checkout@v2 - uses: actions/checkout@v2
# - uses: actions/cache@v2 - uses: actions/cache@v2
# with: with:
# path: | path: |
# ~/.cargo/bin/ ~/.cargo/bin/
# ~/.cargo/registry/index/ ~/.cargo/registry/index/
# ~/.cargo/registry/cache/ ~/.cargo/registry/cache/
# ~/.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: actions-rs/toolchain@v1
# with: with:
# toolchain: nightly toolchain: nightly
# override: true 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
# 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: Run cargo udeps - name: Run cargo udeps
# run: cargo udeps run: cargo udeps

1
crates/bevy_derive/Cargo.toml
View file

@ -14,6 +14,5 @@ proc-macro = true
[dependencies] [dependencies]
bevy_macro_utils = { path = "../bevy_macro_utils", version = "0.5.0" } bevy_macro_utils = { path = "../bevy_macro_utils", version = "0.5.0" }
Inflector = { version = "0.11.4", default-features = false }
quote = "1.0" quote = "1.0"
syn = "1.0" syn = "1.0"

1
deny.toml
View file

@ -53,6 +53,7 @@ skip = [
{ name = "ndk-macro", version = "0.2" }, # from rodio v0.14.0 { 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.3" }, # from rodio v0.14.0
{ name = "ndk-glue", version = "0.4" }, # 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 = "proc-macro-crate", version = "0.1" }, # from rodio v0.14.0
{ name = "stdweb", 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 { name = "strsim", version = "0.9" }, # from rodio v0.14.0