From b6aa402025af7a72aaedd197bf2e740017c70a38 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Fri, 20 Sep 2024 04:28:35 -0700 Subject: [PATCH 1/2] ci: Run `clippy` on all platforms (#2130) So that we get issues for platform-specific code. Also change `macos-14` -> `macos-latest` everywhere. --- .github/workflows/check.yml | 4 +--- .github/workflows/clippy.yml | 10 +++++++++- .github/workflows/firefox.yml | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index fb7877b9ee..490c7047c4 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -24,9 +24,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-14, windows-latest] - # Don't increase beyond what Firefox is currently using: - # https://searchfox.org/mozilla-central/search?q=MINIMUM_RUST_VERSION&path=python/mozboot/mozboot/util.py + os: [ubuntu-latest, macos-latest, windows-latest] # Keep in sync with Cargo.toml rust-toolchain: [1.76.0, stable, nightly] type: [debug] diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index c323f79048..00a6cd029a 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -21,7 +21,15 @@ permissions: jobs: clippy: - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + runs-on: ${{ matrix.os }} + defaults: + run: + shell: bash + steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: ./.github/actions/rust diff --git a/.github/workflows/firefox.yml b/.github/workflows/firefox.yml index 54e2e4b712..a55354fa6d 100644 --- a/.github/workflows/firefox.yml +++ b/.github/workflows/firefox.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-14, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] type: [debug, release] runs-on: ${{ matrix.os }} defaults: From d513712bc9d06e297af5cf317a9f6dd70e69a88b Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Fri, 20 Sep 2024 07:43:51 -0700 Subject: [PATCH 2/2] ci: Use Rust stable to benchmark (#2131) Nightly might have performance regressions. --- .github/workflows/bench.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 8b959fb2f2..65303fdde4 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -10,7 +10,7 @@ env: CARGO_PROFILE_RELEASE_DEBUG: true CARGO_TERM_COLOR: always RUST_BACKTRACE: 1 - TOOLCHAIN: nightly + TOOLCHAIN: stable RUSTFLAGS: -C link-arg=-fuse-ld=lld -C link-arg=-Wl,--no-rosegment, -C force-frame-pointers=yes PERF_OPT: record -F997 --call-graph fp -g