diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72bb297469..b6e762486f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,10 +36,6 @@ env: # Corresponds to https://github.com/gfx-rs/ci-build/releases CI_BINARY_BUILD: "build19" - # We sometimes need nightly to use special things in CI. - # - # In order to prevent CI regressions, we pin the nightly version. - NIGHTLY_VERSION: "nightly-2024-10-17" # This is the MSRV used by `wgpu` itself and all surrounding infrastructure. REPO_MSRV: "1.83" # This is the MSRV used by the `wgpu-core`, `wgpu-hal`, and `wgpu-types` crates, @@ -399,8 +395,8 @@ jobs: - name: Install Nightly Toolchain run: | - rustup toolchain install ${{ env.NIGHTLY_VERSION }} --no-self-update --profile=minimal --component clippy - cargo +${{ env.NIGHTLY_VERSION }} -V + rustup toolchain install ${{ env.REPO_MSRV }} --no-self-update --profile=minimal + cargo +${{ env.REPO_MSRV }} -V - name: Install cargo-hack uses: taiki-e/install-action@v2 @@ -420,7 +416,9 @@ jobs: run: | set -e - cargo +${{ env.NIGHTLY_VERSION }} hack generate-lockfile --remove-dev-deps -Z minimal-versions -p naga -p naga-cli + cargo +${{ env.REPO_MSRV }} hack generate-lockfile --remove-dev-deps -Z minimal-versions -p naga -p naga-cli + env: + RUSTC_BOOTSTRAP: 1 - name: Clippy shell: bash diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 43184ce4ea..34b6196523 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -9,9 +9,8 @@ on: - trunk env: - # We need to use nightly for various features - # when building docs.rs style docs. - NIGHTLY_VERSION: nightly-2025-01-09 + # This is the MSRV used by `wgpu` itself and all surrounding infrastructure. + REPO_MSRV: "1.83" CARGO_INCREMENTAL: false CARGO_TERM_COLOR: always @@ -28,17 +27,21 @@ jobs: persist-credentials: false - name: Install documentation toolchain - run: rustup toolchain install ${{ env.NIGHTLY_VERSION }} --no-self-update --profile=minimal + run: | + rustup toolchain install ${{ env.REPO_MSRV }} --no-self-update --profile=minimal + rustup override set ${{ env.REPO_MSRV }} + + - name: caching + uses: Swatinem/rust-cache@v2 + with: + key: doc-build - - name: Build the docs (nightly) + - name: Build the docs run: | - cargo +${{ env.NIGHTLY_VERSION }} doc --no-deps --lib + cargo doc --no-deps --lib --document-private-items env: RUSTDOCFLAGS: --cfg docsrs - - - name: Build the docs (stable) - run: cargo +stable doc --no-deps --lib - if: ${{ failure() }} + RUSTC_BOOTSTRAP: 1 - name: Deploy the docs uses: JamesIves/github-pages-deploy-action@v4.7.2 diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index bcd1824039..a47fd91789 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -40,6 +40,11 @@ jobs: rustup override set ${{ env.REPO_MSRV }} cargo -V + - name: caching + uses: Swatinem/rust-cache@v2 + with: + key: cargo-generate-${{ matrix.name }} + - name: "Install cargo-generate" uses: taiki-e/install-action@v2 with: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 677541af30..c9c4d5ea6f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,7 +12,6 @@ env: CARGO_INCREMENTAL: false CARGO_TERM_COLOR: always RUST_BACKTRACE: full - RUSTFLAGS: jobs: publish: @@ -37,6 +36,11 @@ jobs: - name: Install wasm-bindgen run: cargo +stable install wasm-bindgen-cli --version=$WASM_BINDGEN_VERSION + - name: caching + uses: Swatinem/rust-cache@v2 + with: + key: publish-build + - name: Build examples run: cargo xtask run-wasm --no-serve