Skip to content

Commit 4134346

Browse files
cypher0n3cypher0n3
committed
ci: bump GitHub Actions and expand dependabot; align golangci-lint
- Dependabot: add github-actions, cli/nvpkg gomod, scripts pip; add labels - Workflows: checkout@v6, setup-node@v6, golangci-lint-action@v9 (version: latest) - api/go and cli/nvpkg Makefiles: run golangci-lint via 'go run' @ latest for CI/local sync - interactive.go: use := in if err assignment
1 parent cc6f517 commit 4134346

11 files changed

Lines changed: 74 additions & 30 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,43 @@
11
version: 2
22
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
open-pull-requests-limit: 5
8+
labels:
9+
- "dependencies"
10+
- "github-actions"
11+
commit-message:
12+
prefix: "ci"
13+
groups:
14+
github-actions:
15+
patterns:
16+
- "*"
17+
318
- package-ecosystem: "gomod"
419
directory: "/api/go"
520
schedule:
621
interval: "weekly"
722
open-pull-requests-limit: 10
23+
labels:
24+
- "dependencies"
25+
- "go"
26+
27+
- package-ecosystem: "gomod"
28+
directory: "/cli/nvpkg"
29+
schedule:
30+
interval: "weekly"
31+
open-pull-requests-limit: 10
32+
labels:
33+
- "dependencies"
34+
- "go"
35+
36+
- package-ecosystem: "pip"
37+
directory: "/scripts"
38+
schedule:
39+
interval: "weekly"
40+
open-pull-requests-limit: 5
41+
labels:
42+
- "dependencies"
43+
- "python"

‎.github/workflows/check-dev-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v6
1515

1616
- name: Check for stray files in dev_docs
1717
run: |

‎.github/workflows/docs-check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ jobs:
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: Checkout code
46-
uses: actions/checkout@v4
46+
uses: actions/checkout@v6
4747

4848
- name: Set up Node.js
49-
uses: actions/setup-node@v4
49+
uses: actions/setup-node@v6
5050
with:
5151
node-version: '20'
5252

‎.github/workflows/go-bdd.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
working-directory: api/go
3131
steps:
3232
- name: Checkout code
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v6
3434

3535
- name: Set up Go
3636
uses: actions/setup-go@v5

‎.github/workflows/go-ci.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
working-directory: api/go
2626
steps:
2727
- name: Checkout code
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v6
2929

3030
- name: Set up Go
3131
uses: actions/setup-go@v5
@@ -47,7 +47,7 @@ jobs:
4747
working-directory: api/go
4848
steps:
4949
- name: Checkout code
50-
uses: actions/checkout@v4
50+
uses: actions/checkout@v6
5151

5252
- name: Set up Go
5353
uses: actions/setup-go@v5
@@ -67,15 +67,15 @@ jobs:
6767
run: go vet ./...
6868

6969
- name: Run golangci-lint
70-
uses: golangci/golangci-lint-action@v7
70+
uses: golangci/golangci-lint-action@v9
7171
with:
72-
version: v2.7.0
72+
version: latest
7373
working-directory: api/go
7474

7575
- name: Run golangci-lint (BDD)
76-
uses: golangci/golangci-lint-action@v7
76+
uses: golangci/golangci-lint-action@v9
7777
with:
78-
version: v2.7.0
78+
version: latest
7979
working-directory: api/go
8080
args: --build-tags=bdd
8181

@@ -87,7 +87,7 @@ jobs:
8787
working-directory: api/go
8888
steps:
8989
- name: Checkout code
90-
uses: actions/checkout@v4
90+
uses: actions/checkout@v6
9191

9292
- name: Set up Go
9393
uses: actions/setup-go@v5
@@ -106,7 +106,7 @@ jobs:
106106
working-directory: api/go
107107
steps:
108108
- name: Checkout code
109-
uses: actions/checkout@v4
109+
uses: actions/checkout@v6
110110

111111
- name: Set up Go
112112
uses: actions/setup-go@v5

‎.github/workflows/nvpkg-ci.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
working-directory: cli/nvpkg
2525
steps:
2626
- name: Checkout code
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v6
2828

2929
- name: Set up Go
3030
uses: actions/setup-go@v5
@@ -49,7 +49,7 @@ jobs:
4949
working-directory: cli/nvpkg
5050
steps:
5151
- name: Checkout code
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@v6
5353

5454
- name: Set up Go
5555
uses: actions/setup-go@v5
@@ -69,9 +69,9 @@ jobs:
6969
run: go vet ./...
7070

7171
- name: Run golangci-lint
72-
uses: golangci/golangci-lint-action@v7
72+
uses: golangci/golangci-lint-action@v9
7373
with:
74-
version: v2.7.0
74+
version: latest
7575
working-directory: cli/nvpkg
7676

7777
build-nvpkg:
@@ -82,7 +82,7 @@ jobs:
8282
working-directory: cli/nvpkg
8383
steps:
8484
- name: Checkout code
85-
uses: actions/checkout@v4
85+
uses: actions/checkout@v6
8686

8787
- name: Set up Go
8888
uses: actions/setup-go@v5
@@ -104,7 +104,7 @@ jobs:
104104
working-directory: cli/nvpkg
105105
steps:
106106
- name: Checkout code
107-
uses: actions/checkout@v4
107+
uses: actions/checkout@v6
108108

109109
- name: Set up Go
110110
uses: actions/setup-go@v5

‎.github/workflows/nvpkg-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
working-directory: cli/nvpkg
4646
steps:
4747
- name: Checkout code
48-
uses: actions/checkout@v4
48+
uses: actions/checkout@v6
4949

5050
- name: Set up Go
5151
uses: actions/setup-go@v5

‎.github/workflows/python-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424

2525
- name: Set up Python
2626
uses: actions/setup-python@v5

‎api/go/Makefile‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@ bdd-domain:
131131
echo "Exit code: $$exit_code"; \
132132
exit $$exit_code
133133

134+
# Use latest golangci-lint so local and CI (.github/workflows/go-ci.yml) stay in sync.
135+
GOLANGCI_LINT_VERSION ?= latest
136+
GOLANGCI_LINT := go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
137+
134138
lint:
135139
@echo "Checking code formatting..."
136140
@if [ "$$(gofmt -s -l . | wc -l)" -gt 0 ]; then \
@@ -142,8 +146,8 @@ lint:
142146
@echo "Running go vet..."
143147
@go vet ./...
144148
@echo ""
145-
@echo "Running golangci-lint..."
146-
@golangci-lint run ./...
149+
@echo "Running golangci-lint $(GOLANGCI_LINT_VERSION)..."
150+
@$(GOLANGCI_LINT) run ./...
147151

148152
# Go signature validation - validates Go signatures in implementation against tech specs
149153
# NOTE: This target must be kept in sync with .github/workflows/docs-check.yml.
@@ -249,19 +253,19 @@ ci:
249253
GOCACHE="$$CACHE_DIR" go vet ./...; \
250254
fi
251255
@echo ""
252-
@echo "6. Running golangci-lint..."
256+
@echo "6. Running golangci-lint $(GOLANGCI_LINT_VERSION)..."
253257
@if ( [ -w "$(HOME)/.cache/go-build" ] 2>/dev/null && touch "$(HOME)/.cache/go-build/.write-test" 2>/dev/null && rm -f "$(HOME)/.cache/go-build/.write-test" ) || [ -z "$(HOME)" ]; then \
254-
golangci-lint run ./...; \
255-
golangci-lint run --build-tags=bdd ./...; \
258+
$(GOLANGCI_LINT) run ./...; \
259+
$(GOLANGCI_LINT) run --build-tags=bdd ./...; \
256260
else \
257261
CACHE_DIR="$$(cd ../.. && pwd)/tmp/go-cache"; \
258262
mkdir -p "$$CACHE_DIR"; \
259-
GOCACHE="$$CACHE_DIR" golangci-lint run ./... || { \
263+
GOCACHE="$$CACHE_DIR" $(GOLANGCI_LINT) run ./... || { \
260264
echo "Error: golangci-lint failed. This may be due to Go module cache permissions."; \
261265
echo "Try running 'go mod tidy' or check Go module cache permissions."; \
262266
exit 1; \
263267
}; \
264-
GOCACHE="$$CACHE_DIR" golangci-lint run --build-tags=bdd ./... || { \
268+
GOCACHE="$$CACHE_DIR" $(GOLANGCI_LINT) run --build-tags=bdd ./... || { \
265269
echo "Error: golangci-lint (BDD) failed. This may be due to Go module cache permissions."; \
266270
echo "Try running 'go mod tidy' or check Go module cache permissions."; \
267271
exit 1; \

‎cli/nvpkg/Makefile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ tidy:
7575
@echo "Dependencies tidied successfully."
7676

7777
# Lint: gofmt, go vet, golangci-lint (same strategy as api/go; uses .golangci.yml)
78+
# Use latest golangci-lint so local and CI (.github/workflows/nvpkg-ci.yml) stay in sync.
79+
GOLANGCI_LINT_VERSION ?= latest
80+
GOLANGCI_LINT := go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
81+
7882
lint:
7983
@echo "Checking code formatting..."
8084
@if [ "$$(gofmt -s -l . | wc -l)" -gt 0 ]; then \
@@ -86,8 +90,8 @@ lint:
8690
@echo "Running go vet..."
8791
@go vet ./...
8892
@echo ""
89-
@echo "Running golangci-lint..."
90-
@golangci-lint run ./...
93+
@echo "Running golangci-lint $(GOLANGCI_LINT_VERSION)..."
94+
@$(GOLANGCI_LINT) run ./...
9195

9296
# Native release build for current OS/arch only. Outputs to $(OUT_DIR)/<goos>-<goarch>/nvpkg (or nvpkg.exe on Windows).
9397
BUILD_GOOS := $(shell go env GOOS)

0 commit comments

Comments
 (0)