towards GitHub merge queues

.github/workflows/ci.yaml

@@ -2,21 +2,18 @@ on:
   push:
     branches: [ staging, trying, master ]
   pull_request:
+  merge_group:
 
 name: Continuous integration
 
-env:
-  CARGO_TERM_COLOR: always
-
 jobs:
-  # On Linux, we check that the crate builds and links for all the toolchains and targets.
-  ci-linux:
+  # We check that the crate builds and links for all the toolchains and targets.
+  ci-riscv:
     strategy:
       matrix:
         # All generated code should be running on stable now, MRSV is 1.59.0
         toolchain: [ stable, nightly, 1.59.0 ]
         target:
-          - x86_64-unknown-linux-gnu
           - riscv32i-unknown-none-elf
           - riscv32imc-unknown-none-elf
           - riscv32imac-unknown-none-elf
@@ -25,25 +22,25 @@ jobs:
         cargo_flags: [ "--no-default-features", "--all-features" ]
         include:
           # Nightly is only for reference and allowed to fail
-          - rust: nightly
+          - toolchain: nightly
             experimental: true
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental || false }}
     steps:
     - uses: actions/checkout@v3
-    - uses: dtolnay/rust-toolchain@master
+    - uses: dtolnay/rust-toolchain@${{ matrix.toolchain }}
       with:
-        toolchain: ${{ matrix.toolchain }}
         targets: ${{ matrix.target }}
     - name: Build library
       run: cargo build --target ${{ matrix.target }} ${{ matrix.cargo_flags }}
       
-  # On macOS and Windows, we at least make sure that the crate builds and links.
+  # On MacOS, Ubuntu, and Windows, we at least make sure that the crate builds and links.
   ci-others:
     strategy:
       matrix:
         os:
-          - macOS-latest
+          - macos-latest
+          - ubuntu-latest
           - windows-latest
         cargo_flags: [ "--no-default-features", "--all-features" ]
     runs-on: ${{ matrix.os }}

.github/workflows/clippy.yaml

@@ -1,14 +1,10 @@
-name: Clippy
-
 on:
   push:
     branches: [ staging, trying, master ]
   pull_request:
-    branches: [ master ]
+  merge_group:
 
-defaults:
-  run:
-    shell: bash
+name: Clippy lints
 
 env:
   CLIPPY_PARAMS: -W clippy::all -W clippy::pedantic -W clippy::nursery -W clippy::cargo
@@ -16,21 +12,22 @@ env:
 jobs:
   clippy:
     name: Clippy
-    runs-on: ubuntu-latest
     strategy:
       matrix:
+        toolchain: [ stable, nightly ]
         cargo_flags:
           - "--no-default-features"
           - "--all-features"
+        include:
+          # Nightly is only for reference and allowed to fail
+          - toolchain: nightly
+            experimental: true
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental || false }}
     steps:
-      - name: Checkout source code
-        uses: actions/checkout@v3
-
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@${{ matrix.toolchain }}
         with:
-          toolchain: stable
           components: clippy
-
       - name: Run clippy
         run: cargo clippy --all ${{ matrix.cargo_flags }} -- -D warnings

.github/workflows/rustfmt.yaml

@@ -2,6 +2,7 @@ on:
   push:
     branches: [ staging, trying, master ]
   pull_request:
+  merge_group:
 
 name: Code formatting check