diff --git a/.github/workflows/test-s390x.yml b/.github/workflows/test-s390x.yml index 4c45b1f22..f51f18ea4 100644 --- a/.github/workflows/test-s390x.yml +++ b/.github/workflows/test-s390x.yml @@ -68,8 +68,8 @@ jobs: script: | apt-get update -y apt-get install -y wget curl git make gcc jq docker.io - wget https://go.dev/dl/go1.22.2.linux-s390x.tar.gz - rm -rf /usr/local/go && tar -C /usr/local -xzf go1.22.2.linux-s390x.tar.gz + wget https://go.dev/dl/go1.23.2.linux-s390x.tar.gz + rm -rf /usr/local/go && tar -C /usr/local -xzf go1.23.2.linux-s390x.tar.gz export PATH=$PATH:/usr/local/go/bin git clone ${GH_REPOSITORY} lifecycle cd lifecycle && git checkout ${GH_REF} diff --git a/Makefile b/Makefile index 84ebbd882..3e00c2473 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ LDFLAGS+=-X 'github.com/buildpacks/lifecycle/cmd.Version=$(LIFECYCLE_VERSION)' GOBUILD:=go build $(GOFLAGS) -ldflags "$(LDFLAGS)" GOTEST=$(GOCMD) test $(GOFLAGS) BUILD_DIR?=$(PWD)$/out -WINDOWS_COMPILATION_IMAGE?=golang:1.22-windowsservercore-1809 +WINDOWS_COMPILATION_IMAGE?=golang:1.23-windowsservercore-1809 SOURCE_COMPILATION_IMAGE?=lifecycle-img BUILD_CTR?=lifecycle-ctr DOCKER_CMD?=make test @@ -357,7 +357,7 @@ install-mockgen: install-golangci-lint: @echo "> Installing golangci-lint..." - $(GOCMD) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2 + $(GOCMD) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0 lint: install-golangci-lint @echo "> Linting code..." diff --git a/acceptance/testdata/launcher/Dockerfile b/acceptance/testdata/launcher/Dockerfile index ccd25109d..dff52f75f 100644 --- a/acceptance/testdata/launcher/Dockerfile +++ b/acceptance/testdata/launcher/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22 as builder +FROM golang:1.23 as builder COPY exec.d/ /go/src/exec.d RUN GO111MODULE=off go build -o helper ./src/exec.d diff --git a/acceptance/testdata/launcher/Dockerfile.windows b/acceptance/testdata/launcher/Dockerfile.windows index 1229ae9f4..eccc18ef9 100644 --- a/acceptance/testdata/launcher/Dockerfile.windows +++ b/acceptance/testdata/launcher/Dockerfile.windows @@ -1,4 +1,4 @@ -FROM golang:1.22-nanoserver-1809 +FROM golang:1.23-nanoserver-1809 COPY exec.d/ /go/src/exec.d WORKDIR /go/src diff --git a/cmd/lifecycle/restorer.go b/cmd/lifecycle/restorer.go index a837fe568..d9e175b55 100644 --- a/cmd/lifecycle/restorer.go +++ b/cmd/lifecycle/restorer.go @@ -120,7 +120,7 @@ func (r *restoreCmd) Exec() error { } analyzedMD.BuildImage = &files.ImageIdentifier{Reference: digestRef.String()} cmd.DefaultLogger.Debugf("Adding build image info to analyzed metadata: ") - cmd.DefaultLogger.Debugf(encoding.ToJSONMaybe(analyzedMD.BuildImage)) + cmd.DefaultLogger.Debug(encoding.ToJSONMaybe(analyzedMD.BuildImage)) } var ( runImage imgutil.Image @@ -188,11 +188,11 @@ func (r *restoreCmd) updateAnalyzedMD(analyzedMD *files.Analyzed, runImage imgut } } cmd.DefaultLogger.Debugf("Run image info in analyzed metadata was: ") - cmd.DefaultLogger.Debugf(encoding.ToJSONMaybe(analyzedMD.RunImage)) + cmd.DefaultLogger.Debug(encoding.ToJSONMaybe(analyzedMD.RunImage)) analyzedMD.RunImage.Reference = digestRef.String() analyzedMD.RunImage.TargetMetadata = targetData cmd.DefaultLogger.Debugf("Run image info in analyzed metadata is: ") - cmd.DefaultLogger.Debugf(encoding.ToJSONMaybe(analyzedMD.RunImage)) + cmd.DefaultLogger.Debug(encoding.ToJSONMaybe(analyzedMD.RunImage)) return nil } diff --git a/go.mod b/go.mod index 838a84ed0..b15981d6d 100644 --- a/go.mod +++ b/go.mod @@ -139,4 +139,4 @@ require ( google.golang.org/protobuf v1.34.1 // indirect ) -go 1.22 +go 1.23 diff --git a/phase/rebaser.go b/phase/rebaser.go index e6a02a7e6..c96c2d0dc 100644 --- a/phase/rebaser.go +++ b/phase/rebaser.go @@ -202,7 +202,7 @@ func (r *Rebaser) validateTarget(appImg imgutil.Image, newBaseImg imgutil.Image) } if rebasable == "false" { if !r.Force { - return fmt.Errorf(msgAppImageNotMarkedRebasable + "; " + msgProvideForceToOverride) + return fmt.Errorf("%s; %s", msgAppImageNotMarkedRebasable, msgProvideForceToOverride) } r.Logger.Warn(msgAppImageNotMarkedRebasable) }