From 3677f927f477cdaaf90fc380fa80763cd24bb107 Mon Sep 17 00:00:00 2001 From: Lars Strojny Date: Fri, 22 Dec 2023 10:33:06 +0100 Subject: [PATCH] Try --- .github/workflows/build.yml | 22 ++++++++++++---------- src/http_server.rs | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0ab651ef..16e206008 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: matrix: include: - { toolchain: stable, host: ubuntu-22.04 } - - { toolchain: nightly, host: macos-12 } + - { toolchain: nightly, host: macos-13 } runs-on: ${{ matrix.host }} steps: - name: Checkout source @@ -65,17 +65,19 @@ jobs: uses: actions-rs/cargo@v1.0.3 with: command: clippy + args: --all ${{ matrix.toolchain == 'nightly' && '-F nightly' || '' }} - - name: Static analysis with clippy + - name: Run tests uses: actions-rs/cargo@v1.0.3 with: - command: clippy - args: --tests + command: test - - name: Run tests + - name: Run benchmarks uses: actions-rs/cargo@v1.0.3 with: - command: test + command: bench + args: -F nightly + if: matrix.toolchain == 'nightly' - name: Check for security issues uses: actions-rs/audit-check@v1.2.0 @@ -89,10 +91,10 @@ jobs: fail-fast: false matrix: include: - - { desc: arm-mac, target: aarch64-apple-darwin, host: macos-12, profile: release, toolchain: stable } - - { desc: arm-mac-dbg, target: aarch64-apple-darwin, host: macos-12, profile: debug, toolchain: stable } - - { desc: intel-mac, target: x86_64-apple-darwin, host: macos-12, profile: release, toolchain: stable } - - { desc: intel-mac-dbg, target: x86_64-apple-darwin, host: macos-12, profile: debug, toolchain: stable } + - { desc: arm-mac, target: aarch64-apple-darwin, host: macos-13, profile: release, toolchain: stable } + - { desc: arm-mac-dbg, target: aarch64-apple-darwin, host: macos-13, profile: debug, toolchain: stable } + - { desc: intel-mac, target: x86_64-apple-darwin, host: macos-13, profile: release, toolchain: stable } + - { desc: intel-mac-dbg, target: x86_64-apple-darwin, host: macos-13, profile: debug, toolchain: stable } - { desc: arm-linux, target: armv7-unknown-linux-gnueabihf, host: ubuntu-22.04, profile: release, toolchain: stable } - { desc: arm-linux-dbg, target: armv7-unknown-linux-gnueabihf, host: ubuntu-22.04, profile: debug, toolchain: stable } - { desc: arm-linux-static, target: armv7-unknown-linux-musleabihf, host: ubuntu-22.04, profile: release, toolchain: stable } diff --git a/src/http_server.rs b/src/http_server.rs index 0116b843f..f8fcb5475 100644 --- a/src/http_server.rs +++ b/src/http_server.rs @@ -427,7 +427,7 @@ mod tests { #[cfg(feature = "nightly")] mod benchmark { - extern crate test; + extern crate test ; use crate::config::CredentialsStore; use crate::http_server::tests::authentication::{DEFAULT_HASH, SECRET_HASH}; use crate::http_server::{authenticate, AUTHENTICATION_CACHE};