Skip to content

Commit

Permalink
Codeql adhere to1.n.p syntax fixes (#4250)
Browse files Browse the repository at this point in the history
* Update for 1.N.P Syntax
  • Loading branch information
casibbald authored Dec 16, 2024
1 parent 2a4556c commit f894a8d
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .golangci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
run:
timeout: 5m
go: '1.23'
go: '1.23.2'

linters:
disable-all: true
Expand Down Expand Up @@ -83,7 +83,7 @@ linters-settings:
- performance
- style
gofumpt:
lang-version: "1.23"
lang-version: "1.23.2"
extra-rules: true
lll:
line-length: 150
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ proto: ## Generate protobuf files
# Sometimes we get whitespace differences when running this on linux vs mac
# So here's how you can do it under linux, on mac
proto-linux:
docker run --rm -v "$(CURRENT_DIR):/app" -w /app golang:1.20 make proto
docker run --rm -v "$(CURRENT_DIR):/app" -w /app golang:1.23.2 make proto

##@ Docker
_docker:
Expand Down
2 changes: 1 addition & 1 deletion gitops-bucket-server.dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Go build
FROM golang:1.23@sha256:574185e5c6b9d09873f455a7c205ea0514bfd99738c5dc7750196403a44ed4b7 AS go-build
FROM golang:1.23.2@sha256:ad5c126b5cf501a8caef751a243bb717ec204ab1aa56dc41dc11be089fafcb4f AS go-build

# Add known_hosts entries for GitHub and GitLab
RUN mkdir ~/.ssh
Expand Down
2 changes: 1 addition & 1 deletion gitops-server.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ COPY --chown=node:node ui /home/app/ui
RUN --mount=type=cache,target=/home/app/ui/.parcel-cache make ui

# Go build
FROM golang:1.23@sha256:574185e5c6b9d09873f455a7c205ea0514bfd99738c5dc7750196403a44ed4b7 AS go-build
FROM golang:1.23.2@sha256:ad5c126b5cf501a8caef751a243bb717ec204ab1aa56dc41dc11be089fafcb4f AS go-build

# Add known_hosts entries for GitHub and GitLab
RUN mkdir ~/.ssh
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/weaveworks/weave-gitops

go 1.23
go 1.23.2

require (
github.com/Masterminds/semver/v3 v3.2.1
Expand Down
2 changes: 1 addition & 1 deletion test/library/libtest.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23@sha256:574185e5c6b9d09873f455a7c205ea0514bfd99738c5dc7750196403a44ed4b7
FROM golang:1.23.2@sha256:ad5c126b5cf501a8caef751a243bb717ec204ab1aa56dc41dc11be089fafcb4f
RUN apt-get update
RUN apt-get -y install curl gnupg
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
Expand Down

0 comments on commit f894a8d

Please sign in to comment.