Skip to content

Commit

Permalink
Revert "Make doc CI use nightly (#16147)" (#16891)
Browse files Browse the repository at this point in the history
This reverts commit 58a7392.

# Objective

This is causing local `cargo run -p ci` runs to fail on `stable` Rust
when used locally. Fixes #16871.

## Solution

Revert #16147. We shouldn't have merged this until we had a full
solution (I missed a Controversial tag, sorry!).

## Testing

`cargo run -p ci` fails for me before this change in the reported
fashion. After this reversion, it passes.
  • Loading branch information
alice-i-cecile authored Dec 19, 2024
1 parent 2178663 commit 05c6931
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ jobs:
- name: Check Compile
# See tools/ci/src/main.rs for the commands this runs
run: cargo run -p ci -- compile

check-compiles-no-std:
runs-on: ubuntu-latest
timeout-minutes: 30
Expand Down Expand Up @@ -295,7 +294,6 @@ jobs:
with:
name: example-run-macos
path: example-run/

check-doc:
runs-on: ubuntu-latest
timeout-minutes: 30
Expand All @@ -310,9 +308,7 @@ jobs:
~/.cargo/git/db/
target/
key: ${{ runner.os }}-check-doc-${{ hashFiles('**/Cargo.toml') }}
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
- uses: dtolnay/rust-toolchain@stable
- name: Install Linux dependencies
uses: ./.github/actions/install-linux-deps
with:
Expand All @@ -323,7 +319,7 @@ jobs:
run: cargo run -p ci -- doc
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0 --cfg docsrs_dep"
RUSTFLAGS: "-C debuginfo=0"
# This currently report a lot of false positives
# Enable it again once it's fixed - https://github.com/bevyengine/bevy/issues/1983
# - name: Installs cargo-deadlinks
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/src/commands/doc_check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ impl Prepare for DocCheckCommand {
),
"Please fix doc warnings in output above.",
)
.with_env_var("RUSTDOCFLAGS", "-D warnings --cfg=docsrs")]
.with_env_var("RUSTDOCFLAGS", "-D warnings")]
}
}

0 comments on commit 05c6931

Please sign in to comment.