From 31282230a95cad3bdb9984df849896e1ddbc1efa Mon Sep 17 00:00:00 2001 From: NexVeridian Date: Tue, 26 Nov 2024 20:59:44 -0800 Subject: [PATCH] ci: swap cargo fmt and clippy to nightly --- .github/workflows/demo-ci.yml | 4 ++-- .github/workflows/loco-cli.yml | 4 ++-- .github/workflows/loco-gen-ci.yml | 4 ++-- .github/workflows/loco-rs-ci.yml | 4 ++-- .github/workflows/starter-lightweight-service.yml | 4 ++-- .github/workflows/starter-rest-api.yml | 4 ++-- .github/workflows/starter-saas.yml | 4 ++-- starters/lightweight-service/.github/workflows/ci.yaml | 4 ++-- starters/rest-api/.github/workflows/ci.yaml | 4 ++-- starters/saas/.github/workflows/ci.yaml | 7 +++---- 10 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.github/workflows/demo-ci.yml b/.github/workflows/demo-ci.yml index e2d9097b9..a46ced034 100644 --- a/.github/workflows/demo-ci.yml +++ b/.github/workflows/demo-ci.yml @@ -22,8 +22,8 @@ jobs: uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - components: rustfmt + toolchain: nightly + components: clippy, rustfmt - name: Setup Rust cache uses: Swatinem/rust-cache@v2 - run: cargo fmt --all -- --check diff --git a/.github/workflows/loco-cli.yml b/.github/workflows/loco-cli.yml index 09f8874bb..7156497b9 100644 --- a/.github/workflows/loco-cli.yml +++ b/.github/workflows/loco-cli.yml @@ -22,8 +22,8 @@ jobs: uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - components: rustfmt + toolchain: nightly + components: clippy, rustfmt - name: Setup Rust cache uses: Swatinem/rust-cache@v2 - run: cargo fmt --all -- --check diff --git a/.github/workflows/loco-gen-ci.yml b/.github/workflows/loco-gen-ci.yml index cf097c80e..cf68ca0b5 100644 --- a/.github/workflows/loco-gen-ci.yml +++ b/.github/workflows/loco-gen-ci.yml @@ -26,8 +26,8 @@ jobs: uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - components: rustfmt + toolchain: nightly + components: clippy, rustfmt - name: Setup Rust cache uses: Swatinem/rust-cache@v2 - name: Run cargo fmt diff --git a/.github/workflows/loco-rs-ci.yml b/.github/workflows/loco-rs-ci.yml index 4c822a841..33689eee7 100644 --- a/.github/workflows/loco-rs-ci.yml +++ b/.github/workflows/loco-rs-ci.yml @@ -22,8 +22,8 @@ jobs: uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - components: rustfmt + toolchain: nightly + components: clippy, rustfmt - name: Setup Rust cache uses: Swatinem/rust-cache@v2 - name: Run cargo fmt diff --git a/.github/workflows/starter-lightweight-service.yml b/.github/workflows/starter-lightweight-service.yml index c8f0d8ccd..615b1bb10 100644 --- a/.github/workflows/starter-lightweight-service.yml +++ b/.github/workflows/starter-lightweight-service.yml @@ -26,8 +26,8 @@ jobs: uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - components: rustfmt + toolchain: nightly + components: clippy, rustfmt - name: Setup Rust cache uses: Swatinem/rust-cache@v2 - run: cargo fmt --all -- --check diff --git a/.github/workflows/starter-rest-api.yml b/.github/workflows/starter-rest-api.yml index 56f4d9b25..13c5d57f8 100644 --- a/.github/workflows/starter-rest-api.yml +++ b/.github/workflows/starter-rest-api.yml @@ -26,8 +26,8 @@ jobs: uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - components: rustfmt + toolchain: nightly + components: clippy, rustfmt - name: Setup Rust cache uses: Swatinem/rust-cache@v2 - run: cargo fmt --all -- --check diff --git a/.github/workflows/starter-saas.yml b/.github/workflows/starter-saas.yml index a59e0be4f..41fb6d0ef 100644 --- a/.github/workflows/starter-saas.yml +++ b/.github/workflows/starter-saas.yml @@ -26,8 +26,8 @@ jobs: uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - components: rustfmt + toolchain: nightly + components: clippy, rustfmt - name: Setup Rust cache uses: Swatinem/rust-cache@v2 - run: cargo fmt --all -- --check diff --git a/starters/lightweight-service/.github/workflows/ci.yaml b/starters/lightweight-service/.github/workflows/ci.yaml index 960630bba..e573f79ba 100644 --- a/starters/lightweight-service/.github/workflows/ci.yaml +++ b/starters/lightweight-service/.github/workflows/ci.yaml @@ -23,8 +23,8 @@ jobs: uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - components: rustfmt + toolchain: nightly + components: clippy, rustfmt - name: Run cargo fmt uses: actions-rs/cargo@v1 with: diff --git a/starters/rest-api/.github/workflows/ci.yaml b/starters/rest-api/.github/workflows/ci.yaml index b2e3e1162..5d581b968 100644 --- a/starters/rest-api/.github/workflows/ci.yaml +++ b/starters/rest-api/.github/workflows/ci.yaml @@ -23,8 +23,8 @@ jobs: uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - components: rustfmt + toolchain: nightly + components: clippy, rustfmt - name: Run cargo fmt uses: actions-rs/cargo@v1 with: diff --git a/starters/saas/.github/workflows/ci.yaml b/starters/saas/.github/workflows/ci.yaml index 75ba8a5e3..5d581b968 100644 --- a/starters/saas/.github/workflows/ci.yaml +++ b/starters/saas/.github/workflows/ci.yaml @@ -23,8 +23,8 @@ jobs: uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ env.RUST_TOOLCHAIN }} - components: rustfmt + toolchain: nightly + components: clippy, rustfmt - name: Run cargo fmt uses: actions-rs/cargo@v1 with: @@ -58,7 +58,7 @@ jobs: permissions: contents: read - + services: redis: image: redis @@ -99,4 +99,3 @@ jobs: env: REDIS_URL: redis://localhost:${{job.services.redis.ports[6379]}} DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres_test -