Skip to content

Commit 386a14f

Browse files
authored
Merge branch 'main' into fix/logback-check-increment
2 parents 1cce8a4 + b262bde commit 386a14f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+903
-412
lines changed

.github/workflows/pr_pre-commit.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,38 @@ on:
77
env:
88
CARGO_TERM_COLOR: always
99
RUST_TOOLCHAIN_VERSION: "1.80.1"
10+
HADOLINT_VERSION: "v1.17.6"
1011

1112
jobs:
1213
pre-commit:
1314
runs-on: ubuntu-latest
1415
steps:
1516
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
17+
with:
18+
fetch-depth: 0
1619
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
1720
with:
1821
python-version: '3.12'
1922
- uses: dtolnay/rust-toolchain@master
2023
with:
2124
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
2225
components: rustfmt,clippy
26+
- name: Setup Hadolint
27+
shell: bash
28+
run: |
29+
set -euo pipefail
30+
31+
LOCATION_DIR="$HOME/.local/bin"
32+
LOCATION_BIN="$LOCATION_DIR/hadolint"
33+
34+
SYSTEM=$(uname -s)
35+
ARCH=$(uname -m)
36+
37+
mkdir -p "$LOCATION_DIR"
38+
curl -sL -o "${LOCATION_BIN}" "https://github.com/hadolint/hadolint/releases/download/${{ env.HADOLINT_VERSION }}/hadolint-$SYSTEM-$ARCH"
39+
chmod 700 "${LOCATION_BIN}"
40+
41+
echo "$LOCATION_DIR" >> "$GITHUB_PATH"
2342
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
43+
with:
44+
extra_args: "--from-ref ${{ github.event.pull_request.base.sha }} --to-ref ${{ github.event.pull_request.head.sha }}"

.github/workflows/reviewdog.yaml

Lines changed: 0 additions & 51 deletions
This file was deleted.

.pre-commit-config.yaml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
---
2-
# See https://pre-commit.com for more information
3-
# See https://pre-commit.com/hooks.html for more hooks
2+
default_language_version:
3+
node: system
4+
45
repos:
56
- repo: https://github.com/pre-commit/pre-commit-hooks
6-
rev: v4.2.0
7+
rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # 4.6.0
78
hooks:
89
- id: trailing-whitespace
910
- id: end-of-file-fixer
@@ -12,28 +13,38 @@ repos:
1213
- id: detect-private-key
1314

1415
- repo: https://github.com/doublify/pre-commit-rust
15-
rev: v1.0
16+
rev: eeee35a89e69d5772bdee97db1a6a898467b686e # 1.0
1617
hooks:
1718
- id: fmt
1819
args: ["--all", "--", "--check"]
1920
- id: clippy
2021
args: ["--all-targets", "--", "-D", "warnings"]
2122
- repo: https://github.com/adrienverge/yamllint
22-
rev: v1.26.3
23+
rev: 81e9f98ffd059efe8aa9c1b1a42e5cce61b640c6 # 1.35.1
2324
hooks:
2425
- id: yamllint
2526

2627
- repo: https://github.com/igorshubovych/markdownlint-cli
27-
rev: v0.31.1
28+
rev: f295829140d25717bc79368d3f966fc1f67a824f # 0.41.0
2829
hooks:
2930
- id: markdownlint
3031

3132
- repo: https://github.com/koalaman/shellcheck-precommit
32-
rev: v0.10.0
33+
rev: 2491238703a5d3415bb2b7ff11388bf775372f29 # 0.10.0
3334
hooks:
3435
- id: shellcheck
3536
args: ["--severity=info"]
3637

38+
- repo: https://github.com/rhysd/actionlint
39+
rev: 62dc61a45fc95efe8c800af7a557ab0b9165d63b # 1.7.1
40+
hooks:
41+
- id: actionlint
42+
43+
- repo: https://github.com/hadolint/hadolint
44+
rev: b3555ba9c2bfd9401e79f2f0da68dd1ae38e10c7 # 2.12.0
45+
hooks:
46+
- id: hadolint
47+
3748
- repo: local
3849
hooks:
3950
- id: .scripts/verify-crate-versions

0 commit comments

Comments
 (0)