Skip to content

Commit

Permalink
all: switch to golang 1.20.7.
Browse files Browse the repository at this point in the history
Signed-off-by: Krisztian Litkey <[email protected]>
  • Loading branch information
klihub committed Aug 30, 2023
1 parent a22fdaa commit 973fad9
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/project-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
- "release/**"

env:
GO_VERSION: "1.19.5"
GO_VERSION: "1.20.7"

jobs:
verify:
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ GOLICENSES_VERSION ?= v1.6.0
CONTAINER_RUN_CMD ?= docker run
IMAGE_BUILD_CMD ?= docker build
IMAGE_BUILD_EXTRA_OPTS ?=
BUILDER_IMAGE ?= golang:1.19-bullseye

GO_CMD := go
GO_BUILD := $(GO_CMD) build
Expand All @@ -45,6 +44,7 @@ GO_LINT := golint -set_exit_status
GO_FMT := gofmt
GO_VET := $(GO_CMD) vet
GO_DEPS := $(GO_CMD) list -f '{{ join .Deps "\n" }}'
GO_VERSION ?= 1.20.7

GO_MODULES := $(shell $(GO_CMD) list ./...)
GO_SUBPKGS := $(shell find ./pkg -name go.mod | sed 's:/go.mod::g' | grep -v testdata)
Expand Down Expand Up @@ -322,9 +322,8 @@ image-deployment-%:
image-%:
$(Q)mkdir -p $(IMAGE_PATH); \
bin=$(patsubst image-%,%,$@); tag=nri-resource-policy-$$bin; \
go_version=`$(GO_CMD) list -m -f '{{.GoVersion}}'`; \
$(DOCKER) build . -f "cmd/$$bin/Dockerfile" \
--build-arg GO_VERSION=$${go_version} \
--build-arg GO_VERSION=$(GO_VERSION) \
-t $(IMAGE_REPO)$$tag:$(IMAGE_VERSION)

pkg/sysfs/sst_types%.go: pkg/sysfs/_sst_types%.go pkg/sysfs/gen_sst_types.sh
Expand Down
4 changes: 2 additions & 2 deletions cmd/balloons/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG GO_VERSION=1.19
ARG GO_VERSION=1.20

FROM golang:${GO_VERSION}-buster as builder
FROM golang:${GO_VERSION}-bullseye as builder

WORKDIR /go/builder

Expand Down
4 changes: 2 additions & 2 deletions cmd/template/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG GO_VERSION=1.19
ARG GO_VERSION=1.20

FROM golang:${GO_VERSION}-buster as builder
FROM golang:${GO_VERSION}-bullseye as builder

WORKDIR /go/builder

Expand Down
4 changes: 2 additions & 2 deletions cmd/topology-aware/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG GO_VERSION=1.19
ARG GO_VERSION=1.20

FROM golang:${GO_VERSION}-buster as builder
FROM golang:${GO_VERSION}-bullseye as builder

WORKDIR /go/builder

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/containers/nri-plugins

go 1.19
go 1.20

require (
contrib.go.opencensus.io/exporter/prometheus v0.4.2
Expand Down
2 changes: 1 addition & 1 deletion pkg/topology/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/containers/nri-plugins/pkg/topology

go 1.19
go 1.20

require golang.org/x/sys v0.1.0

0 comments on commit 973fad9

Please sign in to comment.