Merge branch 'main' into xperf-misc

mstange · Oct 4, 2024 · e53382d · e53382d
2 parents 1fbf3c5 + da89b2f
commit e53382d
Show file tree

Hide file tree

Showing 11 changed files with 290 additions and 352 deletions.
diff --git a/.github/workflows/nix-packaging.yml b/.github/workflows/nix-packaging.yml
@@ -14,7 +14,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@V27
+      - uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=channel:nixos-23.11
       # - uses: cachix/cachix-action@v10

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -47,7 +47,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Rust
-        run: rustup target add ${{ matrix.target }}
+        #run: rustup target add ${{ matrix.target }}
+        run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }} && rustup component add clippy rustfmt
       - if: ${{ matrix.is_musl }}
         name: Install musl-tools
         run: sudo apt-get install -y musl-tools
@@ -77,7 +78,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Rust
-        run: rustup update stable && rustup default stable && rustup target add ${{ matrix.target }}
+        # 1.81 causes issues when running the tests
+        #run: rustup update stable && rustup default stable && rustup target add ${{ matrix.target }}
+        run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }} && rustup component add clippy rustfmt
       - name: Install cross
         # Latest cross release 0.2.5 fails to link binaries for the `aarch64-linux-android` target. A release is pending.
         # Use a specific commit until the release is out. See https://github.com/cross-rs/cross/issues/1222
@@ -103,7 +106,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Rust
-        run: rustup target add ${{ matrix.target }}
+        #run: rustup target add ${{ matrix.target }}
+        run: rustup install 1.80 && rustup default 1.80 && rustup target add ${{ matrix.target }} && rustup component add clippy rustfmt
       - name: Check
         run: cargo check --workspace --verbose --target=${{ matrix.target }}
       - name: Clippy