Skip to content

Commit 05c6931

Browse files
Revert "Make doc CI use nightly (#16147)" (#16891)
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.
1 parent 2178663 commit 05c6931

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ jobs:
126126
- name: Check Compile
127127
# See tools/ci/src/main.rs for the commands this runs
128128
run: cargo run -p ci -- compile
129-
130129
check-compiles-no-std:
131130
runs-on: ubuntu-latest
132131
timeout-minutes: 30
@@ -295,7 +294,6 @@ jobs:
295294
with:
296295
name: example-run-macos
297296
path: example-run/
298-
299297
check-doc:
300298
runs-on: ubuntu-latest
301299
timeout-minutes: 30
@@ -310,9 +308,7 @@ jobs:
310308
~/.cargo/git/db/
311309
target/
312310
key: ${{ runner.os }}-check-doc-${{ hashFiles('**/Cargo.toml') }}
313-
- uses: dtolnay/rust-toolchain@master
314-
with:
315-
toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
311+
- uses: dtolnay/rust-toolchain@stable
316312
- name: Install Linux dependencies
317313
uses: ./.github/actions/install-linux-deps
318314
with:
@@ -323,7 +319,7 @@ jobs:
323319
run: cargo run -p ci -- doc
324320
env:
325321
CARGO_INCREMENTAL: 0
326-
RUSTFLAGS: "-C debuginfo=0 --cfg docsrs_dep"
322+
RUSTFLAGS: "-C debuginfo=0"
327323
# This currently report a lot of false positives
328324
# Enable it again once it's fixed - https://github.com/bevyengine/bevy/issues/1983
329325
# - name: Installs cargo-deadlinks

tools/ci/src/commands/doc_check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ impl Prepare for DocCheckCommand {
1616
),
1717
"Please fix doc warnings in output above.",
1818
)
19-
.with_env_var("RUSTDOCFLAGS", "-D warnings --cfg=docsrs")]
19+
.with_env_var("RUSTDOCFLAGS", "-D warnings")]
2020
}
2121
}

0 commit comments

Comments
 (0)