From c54aa4b99ab335c8b46f96fc5c60f7d41a65c84e Mon Sep 17 00:00:00 2001 From: NexVeridian Date: Tue, 26 Nov 2024 21:02:30 -0800 Subject: [PATCH] ci: swap cargo fmt and clippy to nightly --- .github/workflows/demo-ci.yml | 4 ++-- .github/workflows/loco-gen-ci.yml | 4 ++-- .github/workflows/loco-new.yml | 4 ++-- .github/workflows/loco-rs-ci.yml | 4 ++-- loco-new/base_template/.github/workflows/ci.yaml | 7 +++---- starters/lightweight-service/.github/workflows/ci.yaml | 4 ++-- starters/rest-api/.github/workflows/ci.yaml | 4 ++-- starters/saas/.github/workflows/ci.yaml | 7 +++---- 8 files changed, 18 insertions(+), 20 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-gen-ci.yml b/.github/workflows/loco-gen-ci.yml index 6c72b4c82..f927007b2 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-new.yml b/.github/workflows/loco-new.yml index 4db13adee..5a3e94376 100644 --- a/.github/workflows/loco-new.yml +++ b/.github/workflows/loco-new.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/loco-rs-ci.yml b/.github/workflows/loco-rs-ci.yml index 5129cfc2b..3f253bf65 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/loco-new/base_template/.github/workflows/ci.yaml b/loco-new/base_template/.github/workflows/ci.yaml index 75ba8a5e3..5d581b968 100644 --- a/loco-new/base_template/.github/workflows/ci.yaml +++ b/loco-new/base_template/.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 - 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 -