From b8793e751c59b35945ffe2e02409a80bea44f428 Mon Sep 17 00:00:00 2001 From: Jose Celano Date: Wed, 1 Feb 2023 18:01:05 +0000 Subject: [PATCH 1/4] feat: [#165] upgrade workflow action: actions/checkout@v3 --- .github/workflows/publish_crate.yml | 2 +- .github/workflows/publish_docker_image.yml | 2 +- .github/workflows/test_build_release.yml | 6 +++--- .github/workflows/test_docker.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish_crate.yml b/.github/workflows/publish_crate.yml index 0352064eb..40f332a8c 100644 --- a/.github/workflows/publish_crate.yml +++ b/.github/workflows/publish_crate.yml @@ -23,7 +23,7 @@ jobs: if: needs.check-secret.outputs.publish == 'true' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: profile: minimal diff --git a/.github/workflows/publish_docker_image.yml b/.github/workflows/publish_docker_image.yml index 1587a0bd6..5983bf6a2 100644 --- a/.github/workflows/publish_docker_image.yml +++ b/.github/workflows/publish_docker_image.yml @@ -32,7 +32,7 @@ jobs: if: needs.check-secret.outputs.publish == 'true' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: profile: minimal diff --git a/.github/workflows/test_build_release.yml b/.github/workflows/test_build_release.yml index 3924eea4b..c86cf9994 100644 --- a/.github/workflows/test_build_release.yml +++ b/.github/workflows/test_build_release.yml @@ -9,7 +9,7 @@ jobs: env: CARGO_TERM_COLOR: always steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: profile: minimal @@ -29,7 +29,7 @@ jobs: env: CARGO_TERM_COLOR: always steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: profile: minimal @@ -61,7 +61,7 @@ jobs: env: CARGO_TERM_COLOR: always steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: profile: minimal diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml index 2cfa4de5c..0c3fc36d8 100644 --- a/.github/workflows/test_docker.yml +++ b/.github/workflows/test_docker.yml @@ -8,7 +8,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From 3d1a12b46e7c2326495865ff5d19ed405970abd7 Mon Sep 17 00:00:00 2001 From: Jose Celano Date: Wed, 1 Feb 2023 18:05:41 +0000 Subject: [PATCH 2/4] feat: [#165] upgrade workflow action: Swatinem/rust-cache@v2 --- .github/workflows/publish_crate.yml | 2 +- .github/workflows/publish_docker_image.yml | 2 +- .github/workflows/test_build_release.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish_crate.yml b/.github/workflows/publish_crate.yml index 40f332a8c..644d8af6c 100644 --- a/.github/workflows/publish_crate.yml +++ b/.github/workflows/publish_crate.yml @@ -29,7 +29,7 @@ jobs: profile: minimal toolchain: stable components: llvm-tools-preview - - uses: Swatinem/rust-cache@v1 + - uses: Swatinem/rust-cache@v2 - name: Run Tests run: cargo test diff --git a/.github/workflows/publish_docker_image.yml b/.github/workflows/publish_docker_image.yml index 5983bf6a2..fd82a499e 100644 --- a/.github/workflows/publish_docker_image.yml +++ b/.github/workflows/publish_docker_image.yml @@ -38,7 +38,7 @@ jobs: profile: minimal toolchain: stable components: llvm-tools-preview - - uses: Swatinem/rust-cache@v1 + - uses: Swatinem/rust-cache@v2 - name: Run Tests run: cargo test diff --git a/.github/workflows/test_build_release.yml b/.github/workflows/test_build_release.yml index c86cf9994..38760c747 100644 --- a/.github/workflows/test_build_release.yml +++ b/.github/workflows/test_build_release.yml @@ -16,7 +16,7 @@ jobs: toolchain: nightly override: true components: rustfmt, clippy - - uses: Swatinem/rust-cache@v1 + - uses: Swatinem/rust-cache@v2 - name: Check Rust Formatting uses: actions-rs/cargo@v1 with: @@ -35,7 +35,7 @@ jobs: profile: minimal toolchain: stable components: llvm-tools-preview - - uses: Swatinem/rust-cache@v1 + - uses: Swatinem/rust-cache@v2 - name: Check Rust Code uses: actions-rs/cargo@v1 with: @@ -66,7 +66,7 @@ jobs: with: profile: minimal toolchain: stable - - uses: Swatinem/rust-cache@v1 + - uses: Swatinem/rust-cache@v2 - name: Build Torrust Tracker run: cargo build --release - name: Upload Build Artifact From b14270b5d9666cd4b7260a882c91e007f85cc788 Mon Sep 17 00:00:00 2001 From: Jose Celano Date: Wed, 1 Feb 2023 18:39:52 +0000 Subject: [PATCH 3/4] feat: [#165] replace workflow action actions-rs/toolchain@v1 with dtolnay/rust-toolchain@stable --- .github/workflows/publish_crate.yml | 7 ++----- .github/workflows/publish_docker_image.yml | 3 +-- .github/workflows/test_build_release.yml | 10 +++------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.github/workflows/publish_crate.yml b/.github/workflows/publish_crate.yml index 644d8af6c..c120a0fc5 100644 --- a/.github/workflows/publish_crate.yml +++ b/.github/workflows/publish_crate.yml @@ -24,9 +24,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable with: - profile: minimal toolchain: stable components: llvm-tools-preview - uses: Swatinem/rust-cache@v2 @@ -43,11 +42,9 @@ jobs: uses: actions/checkout@v3 - name: Install stable toolchain - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: - profile: minimal toolchain: stable - override: true - run: cargo publish env: diff --git a/.github/workflows/publish_docker_image.yml b/.github/workflows/publish_docker_image.yml index fd82a499e..20152a727 100644 --- a/.github/workflows/publish_docker_image.yml +++ b/.github/workflows/publish_docker_image.yml @@ -33,9 +33,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable with: - profile: minimal toolchain: stable components: llvm-tools-preview - uses: Swatinem/rust-cache@v2 diff --git a/.github/workflows/test_build_release.yml b/.github/workflows/test_build_release.yml index 38760c747..6153ff77b 100644 --- a/.github/workflows/test_build_release.yml +++ b/.github/workflows/test_build_release.yml @@ -10,11 +10,9 @@ jobs: CARGO_TERM_COLOR: always steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable with: - profile: minimal toolchain: nightly - override: true components: rustfmt, clippy - uses: Swatinem/rust-cache@v2 - name: Check Rust Formatting @@ -30,9 +28,8 @@ jobs: CARGO_TERM_COLOR: always steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable with: - profile: minimal toolchain: stable components: llvm-tools-preview - uses: Swatinem/rust-cache@v2 @@ -62,9 +59,8 @@ jobs: CARGO_TERM_COLOR: always steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable with: - profile: minimal toolchain: stable - uses: Swatinem/rust-cache@v2 - name: Build Torrust Tracker From 42e7e64542a6c570333405c227ca89ba371e6c33 Mon Sep 17 00:00:00 2001 From: Jose Celano Date: Wed, 1 Feb 2023 18:45:01 +0000 Subject: [PATCH 4/4] refactor: [#165] remove unmantained workflow action to run cargo commmands Replaced with using the `cargo` command directly. --- .github/workflows/test_build_release.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test_build_release.yml b/.github/workflows/test_build_release.yml index 6153ff77b..3b9a9a44a 100644 --- a/.github/workflows/test_build_release.yml +++ b/.github/workflows/test_build_release.yml @@ -16,10 +16,7 @@ jobs: components: rustfmt, clippy - uses: Swatinem/rust-cache@v2 - name: Check Rust Formatting - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --check + run: cargo fmt --check test: needs: format @@ -34,15 +31,9 @@ jobs: components: llvm-tools-preview - uses: Swatinem/rust-cache@v2 - name: Check Rust Code - uses: actions-rs/cargo@v1 - with: - command: check - args: --all-targets + run: cargo check --all-targets - name: Clippy Rust Code - uses: actions-rs/cargo@v1 - with: - command: clippy - args: --all-targets -- -D clippy::pedantic + run: cargo clippy --all-targets -- -D clippy::pedantic - uses: taiki-e/install-action@cargo-llvm-cov - uses: taiki-e/install-action@nextest - name: Run Tests