From f9414bd89cba899339c9e7de11b06a23d1b980d8 Mon Sep 17 00:00:00 2001 From: Ross Tannenbaum Date: Wed, 11 Sep 2024 20:09:05 -0700 Subject: [PATCH] chore: go1.22.5 (#1382) --- .github/workflows/PR.yaml | 4 ++-- .github/workflows/build-and-push.yaml | 4 ++-- .github/workflows/lint.yaml | 2 +- .github/workflows/unit-tests.yaml | 2 +- go.mod | 4 ++-- image/Dockerfile | 2 +- scripts/local-dev/go.mod | 6 ++++-- scripts/local-dev/go.sum | 1 + 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/PR.yaml b/.github/workflows/PR.yaml index decacda14..69375bf8c 100644 --- a/.github/workflows/PR.yaml +++ b/.github/workflows/PR.yaml @@ -45,7 +45,7 @@ jobs: - create-dev-cluster runs-on: ubuntu-latest container: - image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.69 + image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.4.4 steps: - name: Checkout @@ -67,7 +67,7 @@ jobs: - create-dev-cluster runs-on: ubuntu-latest container: - image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.69 + image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.4.4 env: KUBECONFIG: /github/home/artifacts/kubeconfig INFRA_TOKEN: ${{ secrets.INFRA_TOKEN }} diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml index b5ca9fab6..a6dc6f3fe 100644 --- a/.github/workflows/build-and-push.yaml +++ b/.github/workflows/build-and-push.yaml @@ -11,7 +11,7 @@ jobs: build-and-push-server: runs-on: ubuntu-latest container: - image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.69 + image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.4.4 steps: - name: Checkout @@ -58,7 +58,7 @@ jobs: build-and-push-certifier: runs-on: ubuntu-latest container: - image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.69 + image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.4.4 steps: - name: Checkout diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 56ef3a6fa..bea0a8308 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -31,7 +31,7 @@ jobs: shellcheck: runs-on: ubuntu-latest container: - image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.69 + image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.4.4 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index d6b3ab789..52c097dfa 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -11,7 +11,7 @@ jobs: unit-test: runs-on: ubuntu-latest container: - image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.69 + image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.4.4 steps: - name: Checkout diff --git a/go.mod b/go.mod index df5f088d6..c4ec57db2 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/stackrox/infra -go 1.21 +go 1.22 -toolchain go1.21.9 +toolchain go1.22.5 require ( cloud.google.com/go/bigquery v1.60.0 diff --git a/image/Dockerfile b/image/Dockerfile index 2579f70bd..ee3451166 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.9 as golang-builder +FROM golang:1.22.5 as golang-builder WORKDIR /go/src/github.com/stackrox/infra diff --git a/scripts/local-dev/go.mod b/scripts/local-dev/go.mod index 7234d9f03..94d8fd6c3 100644 --- a/scripts/local-dev/go.mod +++ b/scripts/local-dev/go.mod @@ -1,5 +1,7 @@ module github.com/stackrox/infra/scripts/local-dev -go 1.20 +go 1.22 -require gopkg.in/yaml.v2 v2.4.0 // indirect +toolchain go1.22.5 + +require gopkg.in/yaml.v2 v2.4.0 diff --git a/scripts/local-dev/go.sum b/scripts/local-dev/go.sum index 75346616b..dd0bc19f1 100644 --- a/scripts/local-dev/go.sum +++ b/scripts/local-dev/go.sum @@ -1,3 +1,4 @@ +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=