Skip to content

Commit

Permalink
Go1.23, bump golangci-lint
Browse files Browse the repository at this point in the history
  • Loading branch information
jotak committed Dec 17, 2024
1 parent b6b7d14 commit b27faf3
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: ['1.22']
go: ['1.23']

steps:
- name: install make
Expand All @@ -26,7 +26,7 @@ jobs:
- name: check clean vendors
run: go mod vendor
- name: Report coverage
if: ${{ matrix.go == '1.22' }}
if: ${{ matrix.go == '1.23' }}
uses: codecov/codecov-action@v4
with:
files: ./cover.out
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: ['1.22']
go: ['1.23']
steps:
- name: install make
run: sudo apt-get install make
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: ['1.22']
go: ['1.23']
steps:
- name: install make
run: sudo apt-get install make
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push_image_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: ['1.22']
go: ['1.23']
steps:
- name: install make
run: sudo apt-get install make
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: ['1.22']
go: ['1.23']
steps:
- name: checkout
uses: actions/checkout@v3
Expand Down
7 changes: 3 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ linters:
- cyclop
- errname
- exhaustive
- exportloopref
- copyloopvar
- gocritic
- gofmt
- gosimple
Expand All @@ -16,16 +16,15 @@ linters:
- stylecheck
- typecheck
- unused
run:
go: "1.22"
linters-settings:
stylecheck:
go: "1.22"
gocritic:
enabled-checks:
- hugeParam
- rangeExprCopy
- rangeValCopy
- indexAlloc
- deprecatedComment
settings:
ifElseChain:
minThreshold: 3
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ WORKDIR /opt/app-root/web
RUN npm run format-all
RUN npm run build$BUILDSCRIPT

FROM docker.io/library/golang:1.22 as go-builder
FROM docker.io/library/golang:1.23 as go-builder

ARG TARGETARCH=amd64
ARG LDFLAGS
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/golang:1.22
FROM docker.io/library/golang:1.23

RUN apt-get update && apt-get install -y \
nodejs \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.cypress
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ WORKDIR /opt/app-root/web
RUN npm run format-all
RUN npm run build$BUILDSCRIPT

FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22 as go-builder
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.23 as go-builder

ARG LDFLAGS
WORKDIR /opt/app-root
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.downstream
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ WORKDIR /opt/app-root/web
RUN npm run format-all
RUN npm run build$BUILDSCRIPT

FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22.5-202407301806.g4c8b32d.el9 as go-builder
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23 as go-builder

ARG BUILDVERSION
ARG DATE
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ifneq ($(CLEAN_BUILD),)
LDFLAGS ?= -X 'main.buildVersion=${VERSION}-${BUILD_SHA}' -X 'main.buildDate=${BUILD_DATE}'
endif

GOLANGCI_LINT_VERSION = v1.53.3
GOLANGCI_LINT_VERSION = v1.61.0
NPM_INSTALL ?= install
CMDLINE_ARGS ?= --loglevel trace --config config/config.yaml

Expand Down
2 changes: 1 addition & 1 deletion pkg/handler/flows.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func (h *Handlers) getFlows(ctx context.Context, lokiClient httpclient.Caller, p
{filters.NewMatch(fields.SrcNamespace, `"`+namespace+`"`)},
{filters.NewMatch(fields.DstNamespace, `"`+namespace+`"`)},
},
func(sq filters.SingleQuery) bool { return false },
func(_ filters.SingleQuery) bool { return false },
)
}

Expand Down

0 comments on commit b27faf3

Please sign in to comment.