Skip to content

Commit

Permalink
Update Go to 1.23:
Browse files Browse the repository at this point in the history
Needed for security dependency updates.

Signed-off-by: Jacob Weinstock <[email protected]>
  • Loading branch information
jacobweinstock committed Jan 11, 2025
1 parent 67791ae commit 237131a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install Go
uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.23'
- name: go fmt
run: go get golang.org/x/tools/cmd/goimports && goimports -d . | (! grep .)
- name: prepare go mod
Expand Down
4 changes: 2 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ linters-settings:
- name: waitgroup-by-value

staticcheck:
go: "1.20"
go: "1.23"

unused:
go: "1.20"
go: "1.23"

output:
sort-results: true
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 as builder
FROM golang:1.23 as builder

WORKDIR /code
COPY go.mod go.sum /code/
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ run-image: ## run PBnJ container image
# BEGIN: lint-install .
# http://github.com/tinkerbell/lint-install

GOLINT_VERSION ?= v1.52.2
HADOLINT_VERSION ?= v2.7.0
SHELLCHECK_VERSION ?= v0.7.2
GOLINT_VERSION ?= v1.63.4
HADOLINT_VERSION ?= v2.12.0
SHELLCHECK_VERSION ?= v0.10.0
LINT_OS := $(shell uname)
LINT_ARCH := $(shell uname -m)

Expand All @@ -132,7 +132,7 @@ out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck:

out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH):
mkdir -p out/linters
curl -sfL https://github.com/hadolint/hadolint/releases/download/v2.6.1/hadolint-$(LINT_OS)-$(LINT_ARCH) > out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH)
curl -sfL https://github.com/hadolint/hadolint/releases/download/$(HADOLINT_VERSION)/hadolint-$(LINT_OS)-$(LINT_ARCH) > out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH)
chmod u+x out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH)

out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH):
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/tinkerbell/pbnj

go 1.20
go 1.23

require (
github.com/bmc-toolbox/bmclib v0.5.7
Expand Down

0 comments on commit 237131a

Please sign in to comment.