Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr_cockpit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
- "go.sum"

env:
RUST_VERSION: 1.83.0
RUST_VERSION: 1.85.0
GO_VERSION: '^1.22.5'
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: "0"
Expand Down
62 changes: 2 additions & 60 deletions .github/workflows/pr_general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Pull Request General
on: workflow_call

env:
RUST_VERSION: 1.83.0
RUST_VERSION: 1.85.0
GO_VERSION: '^1.22.5'
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: "0"
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
with:
key: udeps
cache-all-crates: "true"
- run: cargo install --locked cargo-udeps@0.1.50
- run: cargo install --locked cargo-udeps@0.1.55
- run: cargo udeps --workspace

run_cargodeny:
Expand All @@ -63,62 +63,6 @@ jobs:
with:
command: check ${{ matrix.checks }}

run_rustfmt:
name: Run Rustfmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
with:
submodules: recursive
- uses: dtolnay/rust-toolchain@0e66bd3e6b38ec0ad5312288c83e47c143e6b09e # v1
with:
toolchain: ${{ env.RUST_VERSION }}
components: rustfmt
- run: cargo fmt --all -- --check

run_clippy:
name: Run Clippy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
with:
submodules: recursive

- uses: dtolnay/rust-toolchain@0e66bd3e6b38ec0ad5312288c83e47c143e6b09e # v1
with:
toolchain: ${{ env.RUST_VERSION }}
components: clippy

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: ${{ env.GO_VERSION }}

- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
with:
key: clippy

- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18
cache: yarn

- run: yarn install --frozen-lockfile
- name: Run clippy action to produce annotations
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: giraffate/clippy-action@94e9bd8deab2618756ec5380f12eb35bcb0a88ca
if: env.GITHUB_TOKEN != null
with:
clippy_flags: --all-targets -- -D warnings
github_token: ${{ secrets.GITHUB_TOKEN }}
reporter: "github-pr-check"

- name: Run clippy manually without annotations
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
if: env.GITHUB_TOKEN == null
run: cargo clippy --all-targets -- -D warnings

run_rustdoc:
name: Run RustDoc
runs-on: ubuntu-latest
Expand Down Expand Up @@ -179,8 +123,6 @@ jobs:
needs:
- run_udeps
- run_cargodeny
- run_clippy
- run_rustfmt
- run_rustdoc
- run_tests
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_TOOLCHAIN_VERSION: "1.83.0"
RUST_TOOLCHAIN_VERSION: "nightly-2025-01-15"
HADOLINT_VERSION: "v1.17.6"
NIX_VERSION: "2.25.2"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_stackablectl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- "extra/**"

env:
RUST_VERSION: 1.83.0
RUST_VERSION: 1.85.0
GO_VERSION: '^1.22.5'
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: "0"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_stackablectl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- "stackablectl-[0-9]+.[0-9]+.[0-9]+**"

env:
RUST_VERSION: 1.83.0
RUST_VERSION: 1.85.0
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: "0"
CARGO_PROFILE_DEV_DEBUG: "0"
Expand Down
10 changes: 8 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ repos:
- repo: https://github.com/doublify/pre-commit-rust
rev: eeee35a89e69d5772bdee97db1a6a898467b686e # 1.0
hooks:
- id: fmt
args: ["--all", "--", "--check"]
- id: clippy
args: ["--all-targets", "--all-features", "--", "-D", "warnings"]

Expand Down Expand Up @@ -101,3 +99,11 @@ repos:
entry: make regenerate-nix
stages: [pre-commit, pre-merge-commit, manual]
pass_filenames: false

- id: cargo-rustfmt
name: cargo-rustfmt
language: system
# Pinning to a specific rustc version, so that we get consistent formatting
entry: cargo +nightly-2025-01-15 fmt --all -- --check
stages: [pre-commit]
pass_filenames: false
10 changes: 9 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
{
"rust-analyzer.showUnlinkedFileNotification": false
"rust-analyzer.showUnlinkedFileNotification": false,
"rust-analyzer.cargo.features": "all",
"rust-analyzer.rustfmt.overrideCommand": [
"rustfmt",
"+nightly-2025-01-15",
"--edition",
"2024",
"--"
],
}
Loading
Loading