Skip to content

Commit

Permalink
Upgrade go to 1.18 (#907)
Browse files Browse the repository at this point in the history
* Use go 1.18 in CI
* Bump deps (except toml)

Signed-off-by: Natalie Arellano <[email protected]>
  • Loading branch information
natalieparellano authored Sep 13, 2022
1 parent b5f8bad commit df06171
Show file tree
Hide file tree
Showing 8 changed files with 138 additions and 132 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.18'
- name: Install jq
run: |
mkdir -p deps/bin
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.18'
- name: Test
run: |
make format || true
Expand All @@ -59,7 +59,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.18'
- name: Add runner IP to daemon insecure-registries and firewall
shell: powershell
run: |
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.18'
- name: Install Cosign
uses: sigstore/[email protected]
with:
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.18'
- uses: actions/download-artifact@v2
with:
name: version
Expand Down Expand Up @@ -274,7 +274,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.18'
- name: Add runner IP to daemon insecure-registries and firewall
shell: powershell
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/post-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up go
uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.18'
- name: Install crane
run: |
go install github.com/google/go-containerregistry/cmd/crane@latest
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.17-windowsservercore-1809
WINDOWS_COMPILATION_IMAGE?=golang:1.18-windowsservercore-1809
SOURCE_COMPILATION_IMAGE?=lifecycle-img
BUILD_CTR?=lifecycle-ctr
DOCKER_CMD?=make test
Expand Down Expand Up @@ -225,7 +225,7 @@ install-mockgen:

install-golangci-lint:
@echo "> Installing golangci-lint..."
$(GOCMD) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.42.1
$(GOCMD) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.49.0

lint: install-golangci-lint
@echo "> Linting code..."
Expand All @@ -242,7 +242,7 @@ format: install-goimports

tidy:
@echo "> Tidying modules..."
$(GOCMD) mod tidy -compat=1.17
$(GOCMD) mod tidy -compat=1.18

test: unit acceptance

Expand Down
2 changes: 1 addition & 1 deletion acceptance/testdata/launcher/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.17 as builder
FROM golang:1.18 as builder

COPY exec.d/ /go/src/exec.d
RUN GO111MODULE=off go build -o helper ./src/exec.d
Expand Down
2 changes: 1 addition & 1 deletion acceptance/testdata/launcher/Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.17-nanoserver-1809
FROM golang:1.18-nanoserver-1809

COPY exec.d/ /go/src/exec.d
WORKDIR /go/src
Expand Down
73 changes: 37 additions & 36 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,69 +3,70 @@ module github.com/buildpacks/lifecycle
require (
github.com/BurntSushi/toml v1.1.0
github.com/apex/log v1.9.0
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220517224237-e6f29200ae04
github.com/buildpacks/imgutil v0.0.0-20220527150729-7a271a852e31
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220906183739-a13b39e9d86d
github.com/buildpacks/imgutil v0.0.0-20220805205524-56137f75e24d
github.com/chrismellard/docker-credential-acr-env v0.0.0-20220327082430-c57b701bfc08
github.com/docker/docker v20.10.16+incompatible
github.com/docker/docker v20.10.18+incompatible
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.8
github.com/google/go-containerregistry v0.9.0
github.com/google/go-cmp v0.5.9
github.com/google/go-containerregistry v0.11.0
github.com/heroku/color v0.0.6
github.com/pkg/errors v0.9.1
github.com/sclevine/spec v1.4.0
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
golang.org/x/sync v0.0.0-20220907140024-f12130a52804
golang.org/x/sys v0.0.0-20220913153101-76c7481b5158
)

require (
github.com/Azure/azure-sdk-for-go v65.0.0+incompatible // indirect
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect
github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 // indirect
github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 // indirect
github.com/Azure/go-autorest/autorest/azure/cli v0.4.6 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/aws/aws-sdk-go-v2 v1.16.4 // indirect
github.com/aws/aws-sdk-go-v2/config v1.15.9 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.12.4 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.5 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.11 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.5 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.12 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.17.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.11.7 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.16.6 // indirect
github.com/aws/smithy-go v1.11.2 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.11.4 // indirect
github.com/aws/aws-sdk-go-v2 v1.16.14 // indirect
github.com/aws/aws-sdk-go-v2/config v1.17.5 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.12.18 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.15 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.15 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.22 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.17.16 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.15 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.15 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.11.21 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.16.17 // indirect
github.com/aws/smithy-go v1.13.2 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.12.0 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/docker/cli v20.10.16+incompatible // indirect
github.com/docker/cli v20.10.18+incompatible // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker-credential-helpers v0.6.4 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.4.1 // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/klauspost/compress v1.15.5 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/vbatts/tar-split v0.11.2 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/net v0.0.0-20220526153639-5463443f8c37 // indirect
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
)

go 1.17
go 1.18

replace github.com/containerd/containerd => github.com/containerd/containerd v1.5.10
Loading

0 comments on commit df06171

Please sign in to comment.