From eed160df0585054854050769b7b4cf1eea187732 Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Tue, 13 Feb 2024 10:30:48 +0900 Subject: [PATCH 1/3] Rebased to main. Signed-off-by: Kousuke Saruta --- .github/workflows/lint.yml | 37 ++++++++++--------------------------- .github/workflows/test.yml | 11 ++++------- 2 files changed, 14 insertions(+), 34 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 54b37605..5ff8eb46 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,33 +5,23 @@ jobs: name: cargo fmt runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable with: components: rustfmt toolchain: 1.70.0 - profile: minimal - override: true - - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + - run: cargo fmt --all -- --check clippy-openssl: name: cargo clippy openssl runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable with: components: clippy toolchain: 1.70.0 - profile: minimal - override: true - - uses: actions-rs/cargo@v1 - with: - command: clippy - args: --features=openssl,hw_tests,dangerous_hw_tests --all-targets -- -D clippy::all -D unused_imports -Dwarnings + - run: cargo clippy --features=openssl,hw_tests,dangerous_hw_tests --all-targets -- -D clippy::all -D unused_imports -D warnings clippy-crypto_nossl: name: cargo clippy crypto_nossl @@ -42,23 +32,16 @@ jobs: with: components: clippy toolchain: 1.70.0 - profile: minimal - override: true - - uses: actions-rs/cargo@v1 - with: - command: clippy - args: --features=crypto_nossl,hw_tests,dangerous_hw_tests --all-targets -- -D clippy::all -D unused_imports -Dwarnings + - run: cargo clippy --features=crypto_nossl,hw_tests,dangerous_hw_tests --all-targets -- -D clippy::all -D unused_imports -D warnings readme: name: cargo readme runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable with: toolchain: nightly - profile: minimal - override: true - run: cargo install cargo-readme - run: cargo readme > README.md && git diff --exit-code @@ -66,7 +49,7 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - uses: enarx/spdx@master with: licenses: Apache-2.0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e9f024fc..b051d3a4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,15 +5,12 @@ jobs: name: sw openssl ${{ matrix.toolchain }} ${{ matrix.profile.name }} ${{ matrix.features }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ matrix.toolchain }} - override: true - - uses: actions-rs/cargo@v1 - with: - command: test - args: ${{ matrix.profile.flag }} --features=${{ matrix.features }} + - run: cargo test ${{ matrix.profile.flag }} --features=${{ matrix.features }} + strategy: fail-fast: false matrix: From 42f4c9b3ea7f6b6532e2b41616e045d984a82ca9 Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Tue, 13 Feb 2024 13:12:44 +0900 Subject: [PATCH 2/3] Fix for some more warnings. Signed-off-by: Kousuke Saruta --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5ff8eb46..93d88149 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable with: components: clippy toolchain: 1.70.0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b051d3a4..92f7dc1d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,14 +29,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ matrix.toolchain }} - override: true - - uses: actions-rs/cargo@v1 - with: - command: test - args: ${{ matrix.profile.flag }} --features=${{ matrix.features }} + - run: cargo test ${{ matrix.profile.flag }} --features=${{ matrix.features }} strategy: fail-fast: false matrix: From bd9c536d1f88d8b97a299b14267a04bec3ba9ec1 Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Tue, 13 Feb 2024 13:24:27 +0900 Subject: [PATCH 3/3] Use checkout@v4 Signed-off-by: Kousuke Saruta --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 93d88149..be53281a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,7 +27,7 @@ jobs: name: cargo clippy crypto_nossl runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: components: clippy diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 92f7dc1d..6117a30e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: name: sw crypto_nossl ${{ matrix.toolchain }} ${{ matrix.profile.name }} ${{ matrix.features }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ matrix.toolchain }}