Skip to content

Commit d29fade

Browse files
hyp3rdhyp3rd
authored
Merge branch 'main' into dependabot/github_actions/actions/checkout-7
2 parents 48a1a4d + c3e0a4a commit d29fade

14 files changed

Lines changed: 76 additions & 73 deletions

File tree

‎.github/workflows/docs.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
- "cmd/hypercache-server/README.md"
2626
- ".github/workflows/docs.yml"
2727
push:
28-
branches: [ main ]
28+
branches: [main]
2929
paths:
3030
- "docs/**"
3131
- "mkdocs.yml"
@@ -56,10 +56,11 @@ jobs:
5656
steps:
5757
- uses: actions/checkout@v7
5858
with:
59-
fetch-depth: 0 # docs/ may reference files via relative paths
59+
# docs/ may reference files via relative paths
60+
fetch-depth: 0
6061

6162
- name: Setup Python
62-
uses: actions/setup-python@v6
63+
uses: actions/setup-python@v7
6364
with:
6465
python-version: "3.13"
6566
cache: pip

‎.github/workflows/go.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
echo "proto_enabled=${PROTO_ENABLED:-true}" >> "$GITHUB_OUTPUT"
2424
2525
- name: Set up Go
26-
uses: actions/setup-go@v6.1.0
26+
uses: actions/setup-go@v7
2727
with:
2828
go-version: "${{ steps.settings.outputs.go_version }}"
2929
check-latest: true

‎.github/workflows/image.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ name: image
1717
on:
1818
pull_request:
1919
push:
20-
branches: [ main ]
21-
tags: [ "v*.*.*" ]
20+
branches: [main]
21+
tags: ["v*.*.*"]
2222
workflow_dispatch:
2323

2424
permissions:
@@ -31,7 +31,8 @@ env:
3131

3232
jobs:
3333
build:
34-
name: build${{ github.event_name == 'pull_request' && ' (no push)' || ' + push'
34+
name:
35+
build${{ github.event_name == 'pull_request' && ' (no push)' || ' + push'
3536
}}
3637
runs-on: ubuntu-latest
3738
timeout-minutes: 20
@@ -51,7 +52,7 @@ jobs:
5152
# avoids an avoidable failure on those events.
5253
- name: Log in to GHCR
5354
if: github.event_name != 'pull_request'
54-
uses: docker/login-action@v4.2.0
55+
uses: docker/login-action@v4.4.0
5556
with:
5657
registry: ${{ env.REGISTRY }}
5758
username: ${{ github.actor }}
@@ -83,7 +84,7 @@ jobs:
8384
latest=false
8485
8586
- name: Build${{ github.event_name == 'pull_request' && '' || ' + push' }}
86-
uses: docker/build-push-action@v7.2.0
87+
uses: docker/build-push-action@v7.3.0
8788
with:
8889
context: .
8990
file: cmd/hypercache-server/Dockerfile

‎.github/workflows/lint.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: lint
44
on:
55
pull_request:
66
push:
7-
branches: [ main ]
7+
branches: [main]
88
permissions:
99
contents: read
1010
jobs:
@@ -23,7 +23,7 @@ jobs:
2323
echo "golangci_lint_version=${GOLANGCI_LINT_VERSION}" >> "$GITHUB_OUTPUT"
2424
echo "proto_enabled=${PROTO_ENABLED:-true}" >> "$GITHUB_OUTPUT"
2525
- name: Setup Go
26-
uses: actions/setup-go@v6
26+
uses: actions/setup-go@v7
2727
with:
2828
go-version: "${{ steps.settings.outputs.go_version }}"
2929
check-latest: true
@@ -55,7 +55,8 @@ jobs:
5555
"./pkg/api/*" -not -path "./vendor/*" -not -path "./.gocache/*" -not
5656
-path "./.git/*")
5757
- name: gofumpt
58-
run: gofumpt -l -w $(find . -type f -name '*.go' -not -path "./pkg/api/*" -not
58+
run:
59+
gofumpt -l -w $(find . -type f -name '*.go' -not -path "./pkg/api/*" -not
5960
-path "./vendor/*" -not -path "./.gocache/*" -not -path "./.git/*")
6061
- name: staticcheck
6162
run: staticcheck ./...

‎.github/workflows/openapi.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
- "cmd/hypercache-server/main.go"
2323
- ".github/workflows/openapi.yml"
2424
push:
25-
branches: [ main ]
25+
branches: [main]
2626
paths:
2727
- "cmd/hypercache-server/openapi.yaml"
2828
- "cmd/hypercache-server/openapi.go"
@@ -42,7 +42,7 @@ jobs:
4242
- uses: actions/checkout@v7
4343

4444
- name: Setup Node
45-
uses: actions/setup-node@v6
45+
uses: actions/setup-node@v7
4646
with:
4747
node-version: "22"
4848

@@ -68,7 +68,7 @@ jobs:
6868
echo "go_version=${GO_VERSION}" >> "$GITHUB_OUTPUT"
6969
7070
- name: Setup Go
71-
uses: actions/setup-go@v6
71+
uses: actions/setup-go@v7
7272
with:
7373
go-version: "${{ steps.settings.outputs.go_version }}"
7474
check-latest: true

‎.github/workflows/security.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
set +a
2222
echo "go_version=${GO_VERSION}" >> "$GITHUB_OUTPUT"
2323
- name: Setup Go
24-
uses: actions/setup-go@v6
24+
uses: actions/setup-go@v7
2525
with:
2626
go-version: "${{ steps.settings.outputs.go_version }}"
2727
check-latest: true

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
set +a
2020
echo "go_version=${GO_VERSION}" >> "$GITHUB_OUTPUT"
2121
- name: Setup Go
22-
uses: actions/setup-go@v6
22+
uses: actions/setup-go@v7
2323
with:
2424
go-version: "${{ steps.settings.outputs.go_version }}"
2525
check-latest: true
@@ -40,7 +40,7 @@ jobs:
4040
go test -race -count=10 -shuffle=on -timeout=15m
4141
-coverprofile=coverage.out ./...
4242
- name: Upload coverage artifact
43-
uses: actions/upload-artifact@v6
43+
uses: actions/upload-artifact@v7
4444
with:
4545
name: coverage
4646
path: coverage.out

‎.golangci.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ run:
4242
# Define the Go version limit.
4343
# Mainly related to generics support since go1.18.
4444
# Default: use Go version from the go.mod file, fallback on the env var `GOVERSION`, fallback on 1.17
45-
go: "1.26.4"
45+
go: "1.26.5"
4646

4747
linters:
4848
# Enable specific linter
@@ -161,16 +161,16 @@ linters:
161161
- name: cognitive-complexity
162162
severity: warning
163163
disabled: false
164-
arguments: [ 15 ]
164+
arguments: [15]
165165

166166
- name: cyclomatic
167-
arguments: [ 15 ]
167+
arguments: [15]
168168

169169
# - name: function-length
170170
# arguments: [80, 0]
171171

172172
- name: max-public-structs
173-
arguments: [ 10 ]
173+
arguments: [10]
174174

175175
- name: nested-structs
176176
disabled: true
@@ -179,7 +179,7 @@ linters:
179179
disabled: true
180180

181181
- name: line-length-limit
182-
arguments: [ 150 ]
182+
arguments: [150]
183183

184184
- name: var-naming
185185
disabled: true

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ repos:
4141
hooks:
4242
- id: hadolint-docker
4343
- repo: https://github.com/streetsidesoftware/cspell-cli
44-
rev: v10.0.0
44+
rev: v10.0.1
4545
hooks:
4646
# Spell check changed files
4747
- id: cspell
@@ -57,7 +57,7 @@ repos:
5757
stages: [ commit-msg ]
5858
always_run: true
5959
- repo: https://github.com/markdownlint/markdownlint.git
60-
rev: v0.15.0
60+
rev: v0.17.0
6161
hooks:
6262
- id: markdownlint
6363
name: Markdownlint

‎.pre-commit/unit-test-hook‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ hook() {
2121
local root_dir
2222
root_dir=$(git rev-parse --show-toplevel)
2323

24-
local toolchain_version="1.26.4"
24+
local toolchain_version="1.26.5"
2525
if [[ -f "${root_dir}/.project-settings.env" ]]; then
2626
# shellcheck disable=SC1090
2727
source "${root_dir}/.project-settings.env"

0 commit comments

Comments
 (0)