From 796f2ca65385afc8762d5e1e56b2c903aa0bb0e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Mon, 21 Feb 2022 17:29:24 +0300 Subject: [PATCH 1/6] Cache cargo index --- .github/workflows/cbc.yaml | 3 ++- .github/workflows/cfb-mode.yaml | 3 ++- .github/workflows/cfb8.yaml | 3 ++- .github/workflows/ctr.yaml | 3 ++- .github/workflows/ige.yaml | 3 ++- .github/workflows/ofb.yaml | 3 ++- .github/workflows/pcbc.yaml | 3 ++- .github/workflows/workspace.yml | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cbc.yaml b/.github/workflows/cbc.yaml index a0af2dc..3f66fe8 100644 --- a/.github/workflows/cbc.yaml +++ b/.github/workflows/cbc.yaml @@ -28,7 +28,8 @@ jobs: - thumbv7em-none-eabi - wasm32-unknown-unknown steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master - uses: actions-rs/toolchain@v1 with: toolchain: ${{ matrix.rust }} diff --git a/.github/workflows/cfb-mode.yaml b/.github/workflows/cfb-mode.yaml index 3d45cd5..9222bfe 100644 --- a/.github/workflows/cfb-mode.yaml +++ b/.github/workflows/cfb-mode.yaml @@ -28,7 +28,8 @@ jobs: - thumbv7em-none-eabi - wasm32-unknown-unknown steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master - uses: actions-rs/toolchain@v1 with: toolchain: ${{ matrix.rust }} diff --git a/.github/workflows/cfb8.yaml b/.github/workflows/cfb8.yaml index 990ef3a..7bc6b04 100644 --- a/.github/workflows/cfb8.yaml +++ b/.github/workflows/cfb8.yaml @@ -28,7 +28,8 @@ jobs: - thumbv7em-none-eabi - wasm32-unknown-unknown steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master - uses: actions-rs/toolchain@v1 with: toolchain: ${{ matrix.rust }} diff --git a/.github/workflows/ctr.yaml b/.github/workflows/ctr.yaml index 7edc38a..d5bdf77 100644 --- a/.github/workflows/ctr.yaml +++ b/.github/workflows/ctr.yaml @@ -28,7 +28,8 @@ jobs: - thumbv7em-none-eabi - wasm32-unknown-unknown steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master - uses: actions-rs/toolchain@v1 with: toolchain: ${{ matrix.rust }} diff --git a/.github/workflows/ige.yaml b/.github/workflows/ige.yaml index 627a711..5c94e2a 100644 --- a/.github/workflows/ige.yaml +++ b/.github/workflows/ige.yaml @@ -28,7 +28,8 @@ jobs: - thumbv7em-none-eabi - wasm32-unknown-unknown steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master - uses: actions-rs/toolchain@v1 with: toolchain: ${{ matrix.rust }} diff --git a/.github/workflows/ofb.yaml b/.github/workflows/ofb.yaml index f440a96..8cb25ef 100644 --- a/.github/workflows/ofb.yaml +++ b/.github/workflows/ofb.yaml @@ -28,7 +28,8 @@ jobs: - thumbv7em-none-eabi - wasm32-unknown-unknown steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master - uses: actions-rs/toolchain@v1 with: toolchain: ${{ matrix.rust }} diff --git a/.github/workflows/pcbc.yaml b/.github/workflows/pcbc.yaml index 7caaaf1..d147252 100644 --- a/.github/workflows/pcbc.yaml +++ b/.github/workflows/pcbc.yaml @@ -28,7 +28,8 @@ jobs: - thumbv7em-none-eabi - wasm32-unknown-unknown steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master - uses: actions-rs/toolchain@v1 with: toolchain: ${{ matrix.rust }} diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index 599f211..4d0401b 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -44,7 +44,8 @@ jobs: benches: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master - uses: actions-rs/toolchain@v1 with: toolchain: nightly From c933daa0d623eb2d475b0dec9fb49a188563d157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Mon, 21 Feb 2022 17:31:12 +0300 Subject: [PATCH 2/6] remove benches build from the workspace workflow --- .github/workflows/workspace.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index 4d0401b..2a08e93 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -40,15 +40,3 @@ jobs: with: command: fmt args: --all -- --check - - benches: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: RustCrypto/actions/cargo-cache@master - - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - profile: minimal - override: true - - run: cargo build --all --benches From b350559713663efce826d8e350f7defeaeb27e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Mon, 21 Feb 2022 17:31:25 +0300 Subject: [PATCH 3/6] update Cargo.lock --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d0df10..8242bf2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.118" +version = "0.2.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e509672465a0504304aa87f9f176f2b2b716ed8fb105ebe5c02dc6dce96a94" +checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" [[package]] name = "magma" From 9f32a9d4e37357bf2abfc6262a4c8776af180d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Mon, 21 Feb 2022 17:40:54 +0300 Subject: [PATCH 4/6] fix workflows --- .github/workflows/cbc.yaml | 17 +++++++++-------- .github/workflows/cfb-mode.yaml | 17 +++++++++-------- .github/workflows/cfb8.yaml | 17 +++++++++-------- .github/workflows/ctr.yaml | 17 +++++++++-------- .github/workflows/ige.yaml | 17 +++++++++-------- .github/workflows/ofb.yaml | 17 +++++++++-------- .github/workflows/pcbc.yaml | 17 +++++++++-------- .github/workflows/security-audit.yml | 2 +- .github/workflows/workspace.yml | 2 +- 9 files changed, 65 insertions(+), 58 deletions(-) diff --git a/.github/workflows/cbc.yaml b/.github/workflows/cbc.yaml index 3f66fe8..7bc0c8a 100644 --- a/.github/workflows/cbc.yaml +++ b/.github/workflows/cbc.yaml @@ -51,11 +51,12 @@ jobs: - 1.56.0 # MSRV - stable steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.rust }} - override: true - profile: minimal - - run: cargo test - - run: cargo test --all-features + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + override: true + profile: minimal + - run: cargo test + - run: cargo test --all-features diff --git a/.github/workflows/cfb-mode.yaml b/.github/workflows/cfb-mode.yaml index 9222bfe..7c9ac19 100644 --- a/.github/workflows/cfb-mode.yaml +++ b/.github/workflows/cfb-mode.yaml @@ -51,11 +51,12 @@ jobs: - 1.56.0 # MSRV - stable steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.rust }} - override: true - profile: minimal - - run: cargo test - - run: cargo test --all-features + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + override: true + profile: minimal + - run: cargo test + - run: cargo test --all-features diff --git a/.github/workflows/cfb8.yaml b/.github/workflows/cfb8.yaml index 7bc6b04..18a8428 100644 --- a/.github/workflows/cfb8.yaml +++ b/.github/workflows/cfb8.yaml @@ -51,11 +51,12 @@ jobs: - 1.56.0 # MSRV - stable steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.rust }} - override: true - profile: minimal - - run: cargo test - - run: cargo test --all-features + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + override: true + profile: minimal + - run: cargo test + - run: cargo test --all-features diff --git a/.github/workflows/ctr.yaml b/.github/workflows/ctr.yaml index d5bdf77..e9a9fe0 100644 --- a/.github/workflows/ctr.yaml +++ b/.github/workflows/ctr.yaml @@ -51,11 +51,12 @@ jobs: - 1.56.0 # MSRV - stable steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.rust }} - override: true - profile: minimal - - run: cargo test - - run: cargo test --all-features + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + override: true + profile: minimal + - run: cargo test + - run: cargo test --all-features diff --git a/.github/workflows/ige.yaml b/.github/workflows/ige.yaml index 5c94e2a..fab1254 100644 --- a/.github/workflows/ige.yaml +++ b/.github/workflows/ige.yaml @@ -51,11 +51,12 @@ jobs: - 1.56.0 # MSRV - stable steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.rust }} - override: true - profile: minimal - - run: cargo test - - run: cargo test --all-features + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + override: true + profile: minimal + - run: cargo test + - run: cargo test --all-features diff --git a/.github/workflows/ofb.yaml b/.github/workflows/ofb.yaml index 8cb25ef..4955c1f 100644 --- a/.github/workflows/ofb.yaml +++ b/.github/workflows/ofb.yaml @@ -51,11 +51,12 @@ jobs: - 1.56.0 # MSRV - stable steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.rust }} - override: true - profile: minimal - - run: cargo test - - run: cargo test --all-features + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + override: true + profile: minimal + - run: cargo test + - run: cargo test --all-features diff --git a/.github/workflows/pcbc.yaml b/.github/workflows/pcbc.yaml index d147252..10406a0 100644 --- a/.github/workflows/pcbc.yaml +++ b/.github/workflows/pcbc.yaml @@ -51,11 +51,12 @@ jobs: - 1.56.0 # MSRV - stable steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.rust }} - override: true - profile: minimal - - run: cargo test - - run: cargo test --all-features + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master + - uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ matrix.rust }} + override: true + profile: minimal + - run: cargo test + - run: cargo test --all-features diff --git a/.github/workflows/security-audit.yml b/.github/workflows/security-audit.yml index 0d82d54..4042a37 100644 --- a/.github/workflows/security-audit.yml +++ b/.github/workflows/security-audit.yml @@ -13,7 +13,7 @@ jobs: name: Security Audit runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Cache cargo bin uses: actions/cache@v1 with: diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index 2a08e93..e8ed2ee 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v1 + uses: actions/checkout@v2 - name: Install stable toolchain uses: actions-rs/toolchain@v1 From 4a93b38f377506d17c57e19d3b9e823b626411fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Mon, 21 Feb 2022 17:41:56 +0300 Subject: [PATCH 5/6] use checkout v2 --- .github/workflows/workspace.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index e8ed2ee..fc290dd 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -13,7 +13,7 @@ jobs: clippy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: toolchain: 1.56.0 # MSRV From 76cf842141b90cdde7123d3214336d9470c5448c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Mon, 21 Feb 2022 17:47:44 +0300 Subject: [PATCH 6/6] tweak workspace --- .github/workflows/workspace.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index fc290dd..4e52296 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -13,14 +13,15 @@ jobs: clippy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.56.0 # MSRV - components: clippy - override: true - profile: minimal - - run: cargo clippy --all --all-features -- -D warnings + - uses: actions/checkout@v2 + - uses: RustCrypto/actions/cargo-cache@master + - uses: actions-rs/toolchain@v1 + with: + toolchain: 1.56.0 # MSRV + components: clippy + override: true + profile: minimal + - run: cargo clippy --all --all-features -- -D warnings rustfmt: runs-on: ubuntu-latest