Skip to content

Commit b96cb8a

Browse files
authored
Merge branch 'master' into test-pairing
2 parents ed4d161 + 802e16b commit b96cb8a

27 files changed

+8294
-9268
lines changed

.github/workflows/ci-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
go-version-file: go.mod
2424

2525
- name: Lint
26-
uses: golangci/golangci-lint-action@v6
26+
uses: golangci/golangci-lint-action@v7
2727
with:
28-
version: v1.63.1
28+
version: v2.0.2
2929
skip-pkg-cache: true
3030
skip-build-cache: true
3131
args: --config=./.golangci.yml --verbose

.github/workflows/govulncheck.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: govulncheck
2+
on:
3+
pull_request:
4+
branches:
5+
- master
6+
7+
jobs:
8+
govulncheck:
9+
name: govulncheck
10+
runs-on: ubuntu-24.04
11+
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v4
15+
16+
- name: Install Go
17+
uses: actions/setup-go@v5
18+
with:
19+
go-version-file: go.mod
20+
21+
- name: Run govulncheck
22+
uses: golang/govulncheck-action@v1
23+
with:
24+
go-version-input: ${{ steps.install-go.outputs.go-version }}
25+
go-package: ./...
26+
repo-checkout: false

.golangci.yml

Lines changed: 61 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,65 @@
1-
run:
2-
# timeout for analysis, e.g. 30s, 5m, default is 1m
3-
timeout: 10m
4-
1+
version: "2"
52
linters:
63
enable:
7-
- megacheck
4+
- asasalint
5+
- asciicheck
6+
- bidichk
7+
- bodyclose
8+
- durationcheck
9+
- errchkjson
10+
- errorlint
11+
- exhaustive
12+
- gocheckcompilerdirectives
13+
- gochecksumtype
814
- gocyclo
9-
- gofmt
10-
- revive
15+
- gosec
16+
- gosmopolitan
17+
- loggercheck
18+
- makezero
1119
- misspell
12-
presets: # groups of linters. See https://golangci-lint.run/usage/linters/
13-
- bugs
14-
- unused
15-
disable:
16-
- golint # deprecated, use 'revive'
17-
- scopelint # deprecated, use 'exportloopref'
18-
- contextcheck # too many false-positives
19-
- noctx # not needed
20-
21-
# all available settings of specific linters
22-
linters-settings:
23-
unparam:
24-
# Inspect exported functions, default is false. Set to true if no external program/library imports your code.
25-
# XXX: if you enable this setting, unparam will report a lot of false-positives in text editors:
26-
# if it's called for subdir of a project it can't find external interfaces. All text editor integrations
27-
# with golangci-lint call it on a directory with the changed file.
28-
check-exported: true
29-
testifylint:
30-
disable:
31-
- suite-dont-use-pkg
32-
revive:
33-
rules:
34-
- name: dot-imports
35-
disabled: true # we allow for dot-import
20+
- musttag
21+
- nilerr
22+
- nilnesserr
23+
- protogetter
24+
- reassign
25+
- recvcheck
26+
- revive
27+
- rowserrcheck
28+
- spancheck
29+
- sqlclosecheck
30+
- testifylint
31+
- unparam
32+
- zerologlint
33+
disable:
34+
- contextcheck
35+
- noctx
36+
settings:
37+
revive:
38+
rules:
39+
- name: dot-imports
40+
disabled: true
41+
testifylint:
42+
disable:
43+
- suite-dont-use-pkg
44+
unparam:
45+
check-exported: true
46+
exclusions:
47+
generated: lax
48+
presets:
49+
- comments
50+
- common-false-positives
51+
- legacy
52+
- std-error-handling
53+
paths:
54+
- third_party$
55+
- builtin$
56+
- examples$
57+
formatters:
58+
enable:
59+
- gofmt
60+
exclusions:
61+
generated: lax
62+
paths:
63+
- third_party$
64+
- builtin$
65+
- examples$

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @MatousJobanek @xcoulon @alexeykazakov @rajivnathan @ranakan19 @mfrancisc @rsoaresd @fbm3307 @metlos @jrosental
1+
* @MatousJobanek @xcoulon @alexeykazakov @rajivnathan @mfrancisc @rsoaresd @fbm3307 @metlos @jrosental

OWNERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ approvers:
55
- MatousJobanek
66
- xcoulon
77
- rajivnathan
8-
- ranakan19
98
- mfrancisc
109
- fbm3307
1110
- metlos
@@ -17,9 +16,8 @@ reviewers:
1716
- MatousJobanek
1817
- xcoulon
1918
- rajivnathan
20-
- ranakan19
2119
- mfrancisc
2220
- fbm3307
2321
- metlos
2422
- rsoaresd
25-
- jrosental
23+
- jrosental

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This repo contains e2e tests for https://github.com/codeready-toolchain/host-ope
77

88
== Build
99

10-
Requires Go version 1.21.x (1.21.13 or higher) - download for your development environment https://golang.org/dl/[here].
10+
Requires Go version 1.22.x (1.22.12 or higher) - download for your development environment https://golang.org/dl/[here].
1111

1212
This repository uses https://github.com/golang/go/wiki/Modules[Go modules].
1313

0 commit comments

Comments
 (0)