Skip to content

Bump go 1.20 -> 1.22 and pin some dependencies #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
divolgin merged 1 commit into from
Sep 23, 2024
Merged

Bump go 1.20 -> 1.22 and pin some dependencies #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:

docs:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
steps:
- checkout
- run: |
Expand All @@ -19,14 +19,14 @@ jobs:
make pipeline-nointegration
test:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
steps:
- checkout
- run: make build-deps ci-test # ci-upload-coverage

scan:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
steps:
- checkout
- setup_remote_docker
Expand All @@ -40,7 +40,7 @@ jobs:
machine: true
environment:
GOPATH: /home/circleci/go
GO_SHA256SUM: 9c5d48c54dd8b0a3b2ef91b0f92a1190aa01f11d26e98033efa64c46a30bba7b
GO_SHA256SUM: 904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0
GO: /usr/local/go/bin/go
GOCACHE: "/tmp/go/cache"
steps:
Expand All @@ -49,7 +49,7 @@ jobs:
keys:
- support-bundle-e2e-build-cache-base
- run: |
export GO_DOWNLOAD_URL=https://go.dev/dl/go1.20.12.linux-amd64.tar.gz
export GO_DOWNLOAD_URL=https://go.dev/dl/go1.22.5.linux-amd64.tar.gz
export GOPATH=/home/circleci/go
export GOROOT=/usr/local/go
export PATH=$PATH:$GOROOT/bin:$GOPATH/bin
Expand All @@ -60,7 +60,7 @@ jobs:
tar -zxvf golang.tar.gz -C /tmp
sudo rm -rf ${GOROOT}
sudo mv /tmp/go ${GOROOT}
- run: docker run -d --entrypoint sh --label com.replicated.support-bundle=true cimg/go:1.20 -c "sleep infinity"
- run: docker run -d --entrypoint sh --label com.replicated.support-bundle=true cimg/go:1.22 -c "sleep infinity"
- run: |
export GOPATH=/home/circleci/go
export GOROOT=/usr/local/go
Expand All @@ -73,7 +73,7 @@ jobs:

deploy:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
steps:
- checkout
- setup_remote_docker
Expand All @@ -85,7 +85,7 @@ jobs:

deploy_unstable:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
steps:
- checkout
- setup_remote_docker
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20
FROM golang:1.22

RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y \
jq \
Expand Down
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ bin/support-bundle: $(SRC) pkg/collect/bundle/defaultspec/asset.go

build-deps:
go install golang.org/x/lint/golint@latest
go install golang.org/x/tools/cmd/goimports@latest
go install golang.org/x/tools/cmd/goimports@v0.25.0
go install github.com/a-urth/go-bindata/go-bindata@latest
go install github.com/onsi/ginkgo/ginkgo@latest
go install github.com/onsi/ginkgo/ginkgo@v1.16.5
go install github.com/golang/mock/mockgen@latest

.state/coverage.out: $(SRC)
Expand Down Expand Up @@ -149,7 +149,7 @@ e2e-supportbundle-core:
-v /var/run/docker.sock:/var/run/docker.sock \
-w /go/src/$(PKG) \
-l com.replicated.support-bundle=true \
golang:1.20 \
golang:1.22 \
/bin/sh -c " \
./e2e/collect/e2e.sh \
"
Expand All @@ -164,7 +164,7 @@ e2e-supportbundle-docker:
-w /go/src/$(PKG) \
-l com.replicated.support-bundle=true \
-e DOCKER=1 \
golang:1.20 \
golang:1.22 \
/bin/sh -c " \
./e2e/collect/e2e.sh \
"
Expand All @@ -178,7 +178,7 @@ e2e-supportbundle-swarm:
-w /go/src/$(PKG) \
-l com.replicated.support-bundle=true \
-e SWARM=1 \
golang:1.20 \
golang:1.22 \
/bin/sh -c " \
./e2e/collect/e2e.sh \
"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/replicatedcom/support-bundle

go 1.20
go 1.22

require (
github.com/Masterminds/semver v1.4.2 // indirect
Expand Down