Merge branch 'main' into fix-delay-initial-drop

mozilla · Sep 25, 2024 · eb0bb75 · eb0bb75
2 parents ea03722 + d513712
commit eb0bb75
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git 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
 

diff --git 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
@@ -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
@@ -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: