Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use nightly for docs #4906

Merged
merged 2 commits into from
Dec 20, 2023
Merged

Use nightly for docs #4906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4fcc79
Use nightly for docs
cwfitzgerald Dec 20, 2023
c102367
Fix unused import
cwfitzgerald Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ jobs:
rustup override set ${{ env.REPO_MSRV }}
cargo -V

# Use nightly for rustdoc, see https://github.com/gfx-rs/wgpu/issues/4905
- name: Install Nightly toolchain
run: |
rustup toolchain install nightly --no-self-update --profile=minimal --component rust-docs --target ${{ matrix.target }}
cargo +nightly -V

- name: disable debug
shell: bash
run: |
Expand Down Expand Up @@ -146,11 +152,11 @@ jobs:
# build for WebGPU
cargo clippy --target ${{ matrix.target }} --tests --features glsl,spirv,fragile-send-sync-non-atomic-wasm
cargo clippy --target ${{ matrix.target }} --tests --features glsl,spirv
cargo doc --target ${{ matrix.target }} --no-deps --features glsl,spirv
cargo +nightly doc --target ${{ matrix.target }} --no-deps --features glsl,spirv

# all features
cargo clippy --target ${{ matrix.target }} --tests --all-features
cargo doc --target ${{ matrix.target }} --no-deps --all-features
cargo +nightly doc --target ${{ matrix.target }} --no-deps --all-features

- name: check em
if: matrix.kind == 'em'
Expand Down Expand Up @@ -180,7 +186,7 @@ jobs:
cargo clippy --target ${{ matrix.target }} --tests --all-features

# build docs
cargo doc --target ${{ matrix.target }} --all-features --no-deps
cargo +nightly doc --target ${{ matrix.target }} --all-features --no-deps

# We run minimal checks on the MSRV of the core crates, ensuring that
# its dependency tree does not cause issues for firefox.
Expand Down
2 changes: 1 addition & 1 deletion naga/src/front/glsl/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pub use pp_rs::token::{Float, Integer, Location, PreprocessorError, Token as PPToken};
pub use pp_rs::token::{Float, Integer, Location, Token as PPToken};

use super::ast::Precision;
use crate::{Interpolation, Sampling, Span, Type};
Expand Down
Loading