diff --git a/.circleci/config.yml b/.circleci/config.yml index 9d4eb500..7b2cee46 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,11 +7,11 @@ jobs: docs: docker: - - image: cimg/go:1.22 + - image: cimg/go:1.23 steps: - checkout - run: | - curl -fsSL https://deb.nodesource.com/setup_14.x | sudo -E bash - + curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash - sudo apt-get install -y nodejs - run: sudo npm install -g yarn - run: | @@ -19,14 +19,14 @@ jobs: make pipeline-nointegration test: docker: - - image: cimg/go:1.22 + - image: cimg/go:1.23 steps: - checkout - run: make build-deps ci-test # ci-upload-coverage scan: docker: - - image: cimg/go:1.22 + - image: cimg/go:1.23 steps: - checkout - setup_remote_docker @@ -40,7 +40,7 @@ jobs: machine: true environment: GOPATH: /home/circleci/go - GO_SHA256SUM: 904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0 + GO_SHA256SUM: d3847fef834e9db11bf64e3fb34db9c04db14e068eeb064f49af747010454f90 GO: /usr/local/go/bin/go GOCACHE: "/tmp/go/cache" steps: @@ -49,7 +49,7 @@ jobs: keys: - support-bundle-e2e-build-cache-base - run: | - export GO_DOWNLOAD_URL=https://go.dev/dl/go1.22.5.linux-amd64.tar.gz + export GO_DOWNLOAD_URL=https://go.dev/dl/go1.23.12.linux-amd64.tar.gz export GOPATH=/home/circleci/go export GOROOT=/usr/local/go export PATH=$PATH:$GOROOT/bin:$GOPATH/bin @@ -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.22 -c "sleep infinity" + - run: docker run -d --entrypoint sh --label com.replicated.support-bundle=true cimg/go:1.23 -c "sleep infinity" - run: | export GOPATH=/home/circleci/go export GOROOT=/usr/local/go @@ -73,7 +73,7 @@ jobs: deploy: docker: - - image: cimg/go:1.22 + - image: cimg/go:1.23 steps: - checkout - setup_remote_docker @@ -85,7 +85,7 @@ jobs: deploy_unstable: docker: - - image: cimg/go:1.22 + - image: cimg/go:1.23 steps: - checkout - setup_remote_docker diff --git a/Dockerfile b/Dockerfile index 7394c335..8050dc64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22 +FROM golang:1.23 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install --no-install-recommends -y \ jq \ diff --git a/Makefile b/Makefile index 5b5d34bc..20e4b55b 100644 --- a/Makefile +++ b/Makefile @@ -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.22 \ + golang:1.23 \ /bin/sh -c " \ ./e2e/collect/e2e.sh \ " @@ -164,7 +164,7 @@ e2e-supportbundle-docker: -w /go/src/$(PKG) \ -l com.replicated.support-bundle=true \ -e DOCKER=1 \ - golang:1.22 \ + golang:1.23 \ /bin/sh -c " \ ./e2e/collect/e2e.sh \ " @@ -178,7 +178,7 @@ e2e-supportbundle-swarm: -w /go/src/$(PKG) \ -l com.replicated.support-bundle=true \ -e SWARM=1 \ - golang:1.22 \ + golang:1.23 \ /bin/sh -c " \ ./e2e/collect/e2e.sh \ " diff --git a/go.mod b/go.mod index 2ff80cbe..2bfa2361 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/replicatedcom/support-bundle -go 1.22 +go 1.23 require ( github.com/Masterminds/semver v1.4.2 // indirect