Skip to content

Commit

Permalink
fix github runner
Browse files Browse the repository at this point in the history
  • Loading branch information
jakeschuurmans committed Sep 17, 2024
1 parent 546b78f commit 12daf9c
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 15 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/push-pr-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'
- name: Checkout code
uses: actions/checkout@v4
- name: golangci-lint
uses: golangci/golangci-lint-action@v4
with:
skip-cache: true
args: --config .golangci.yml --timeout 2m
version: v1.56.2
version: v1.55.2
- name: Test
run: go test ./...
build:
Expand All @@ -25,7 +26,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'

- name: Checkout code
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
-
name: install cosign
uses: sigstore/cosign-installer@main
Expand All @@ -44,4 +44,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COSIGN_EXPERIMENTAL: 1
GOVERSION: "1.21"
GOVERSION: "1.22"
15 changes: 6 additions & 9 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# golangci.com configuration
# https://github.com/golangci/golangci/wiki/Configuration
service:
golangci-lint-version: 1.56.2 # use the fixed version to not introduce new linters unexpectedly
golangci-lint-version: 1.55.2 # use the fixed version to not introduce new linters unexpectedly

linters-settings:
govet:
auto-fix: true
check-shadowing: true
settings:
printf:
funcs:
Expand Down Expand Up @@ -47,6 +46,7 @@ linters-settings:
extra-rules: true
wsl:
auto-fix: true
shadow: true

linters:
enable:
Expand Down Expand Up @@ -75,14 +75,11 @@ linters:
enable-all: false
disable-all: true

run:
# build-tags:
skip-dirs:
- internal/fixtures
skip-files:
- "(.*/)*.*_test.go"

issues:
exclude-files:
- "(.*/)*.*_test.go"
exclude-dirs:
- internal/fixtures
exclude-rules:
- linters:
- gosec
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ gen-store-mock:
## Build linux bin
build:
ifeq ($(GO_VERSION), 0)
$(error build requies go version 1.20.x+ or higher)
$(error build requies go version 1.22.x+ or higher)
endif
GOOS=linux GOARCH=amd64 go build -o bomservice \
-ldflags \
Expand Down

0 comments on commit 12daf9c

Please sign in to comment.