From f1499221e19e49256c8a32fac5b81059ce06f09f Mon Sep 17 00:00:00 2001 From: Parker Timmerman Date: Sun, 29 Dec 2024 14:57:35 -0500 Subject: [PATCH] use Nightly for cargo doc, use pinned Nightly for fuzzing --- .github/workflows/clippy.yml | 5 +++-- .github/workflows/fuzz.yml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index ee799cdc..38fac38b 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -11,6 +11,7 @@ env: CARGO_TERM_COLOR: "always" RUSTFLAGS: "-D warnings" RUST_VERSION: 1.83.0 + RUST_NIGHTLY_VERSION: "nightly-2024-12-20" jobs: fmt: @@ -59,8 +60,8 @@ jobs: - name: Install toolchain run: | - rustup toolchain install ${{ env.RUST_VERSION }} --no-self-update --profile minimal - rustup override set ${{ env.RUST_VERSION }} + rustup toolchain install ${{ env.RUST_NIGHTLY_VERSION }} --no-self-update --profile minimal + rustup override set ${{ env.RUST_NIGHTLY_VERSION }} - uses: Swatinem/rust-cache@v2 - name: Run rustdoc run: cargo doc --all-features --no-deps --manifest-path compact_str/Cargo.toml diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index 32d3a2b5..0b88085c 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -4,11 +4,11 @@ on: - main pull_request: paths: - - 'compact_str/**' - - 'fuzz/**' - - '.github/workflows/fuzz.yml' - - '!CHANGELOG.md' - - '!**/README.md' + - "compact_str/**" + - "fuzz/**" + - ".github/workflows/fuzz.yml" + - "!CHANGELOG.md" + - "!**/README.md" workflow_dispatch: # schedule: # - cron: '0 01,13 * * *' @@ -18,6 +18,7 @@ name: Fuzz env: CARGO_TERM_COLOR: "always" RUSTFLAGS: "-D warnings -Zrandomize-layout" + RUST_NIGHTLY_VERSION: "nightly-2024-12-20" jobs: libFuzzer_x86_64: @@ -26,11 +27,11 @@ jobs: steps: - uses: actions/checkout@v4 name: Checkout compact_str - + - name: Install toolchain run: | - rustup toolchain install nightly-2024-06-01 --no-self-update - rustup override set nightly-2024-06-01 + rustup toolchain install ${{ env.RUST_NIGHTLY_VERSION }} --no-self-update + rustup override set ${{ env.RUST_NIGHTLY_VERSION }} rustup target add x86_64-unknown-linux-musl - name: Install cargo-fuzz uses: taiki-e/install-action@v2 @@ -38,7 +39,6 @@ jobs: tool: cargo-fuzz - uses: Swatinem/rust-cache@v2 - - name: Set Fuzz Time run: | if [[ "${{github.event_name}}" == "push" || "${{github.event_name}}" == "pull_request" ]]; then