From 6d27d26ff00164da694602240239966d208c3f00 Mon Sep 17 00:00:00 2001 From: Arris Li Date: Mon, 29 Apr 2024 19:47:35 +1200 Subject: [PATCH] bump go version to 1.20.12 --- .github/workflows/ci-go.yml | 6 +++--- .pipelines/ci.yml | 2 +- .pipelines/onebranch/pipeline.buildrp.official.yml | 2 +- .pipelines/onebranch/pipeline.buildrp.pullrequest.yml | 2 +- pkg/containerinstall/install_test.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-go.yml b/.github/workflows/ci-go.yml index f79b05caedf..d55e553282b 100644 --- a/.github/workflows/ci-go.yml +++ b/.github/workflows/ci-go.yml @@ -15,7 +15,7 @@ jobs: ci-from-docker: runs-on: ubuntu-latest container: - image: registry.access.redhat.com/ubi8/go-toolset:1.20.10 + image: registry.access.redhat.com/ubi8/go-toolset:1.20.12-5 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -32,7 +32,7 @@ jobs: vendor-check: runs-on: ubuntu-latest container: - image: registry.access.redhat.com/ubi8/go-toolset:1.20.10 + image: registry.access.redhat.com/ubi8/go-toolset:1.20.12-5 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -44,7 +44,7 @@ jobs: generate-check: runs-on: ubuntu-latest container: - image: registry.access.redhat.com/ubi8/go-toolset:1.20.10 + image: registry.access.redhat.com/ubi8/go-toolset:1.20.12-5 steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/.pipelines/ci.yml b/.pipelines/ci.yml index 3564656b43d..ecdda2ebaec 100644 --- a/.pipelines/ci.yml +++ b/.pipelines/ci.yml @@ -22,7 +22,7 @@ pr: resources: containers: - container: golang - image: registry.access.redhat.com/ubi8/go-toolset:1.20.10 + image: registry.access.redhat.com/ubi8/go-toolset:1.20.12-5 options: --user=0 - container: python image: registry.access.redhat.com/ubi8/python-39:latest diff --git a/.pipelines/onebranch/pipeline.buildrp.official.yml b/.pipelines/onebranch/pipeline.buildrp.official.yml index b95d8ba98c7..6eed198f46c 100644 --- a/.pipelines/onebranch/pipeline.buildrp.official.yml +++ b/.pipelines/onebranch/pipeline.buildrp.official.yml @@ -14,7 +14,7 @@ pr: none variables: Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning ONEBRANCH_AME_ACR_LOGIN: cdpxb8e9ef87cd634085ab141c637806568c00.azurecr.io - LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.20.10 # Docker image which is used to build the project https://aka.ms/obpipelines/containers + LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.20.12-5 # Docker image which is used to build the project https://aka.ms/obpipelines/containers Debian_Frontend: noninteractive resources: diff --git a/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml b/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml index 62df20d5cb9..450c6cc99b9 100644 --- a/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml +++ b/.pipelines/onebranch/pipeline.buildrp.pullrequest.yml @@ -14,7 +14,7 @@ pr: none variables: Cdp_Definition_Build_Count: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning ONEBRANCH_AME_ACR_LOGIN: cdpxb8e9ef87cd634085ab141c637806568c00.azurecr.io - LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.20.10 # Docker image which is used to build the project https://aka.ms/obpipelines/containers + LinuxContainerImage: $(ONEBRANCH_AME_ACR_LOGIN)/b8e9ef87-cd63-4085-ab14-1c637806568c/official/ubi8/go-toolset:1.20.12-5 # Docker image which is used to build the project https://aka.ms/obpipelines/containers Debian_Frontend: noninteractive resources: diff --git a/pkg/containerinstall/install_test.go b/pkg/containerinstall/install_test.go index 620a7e62fa3..12a075ab518 100644 --- a/pkg/containerinstall/install_test.go +++ b/pkg/containerinstall/install_test.go @@ -27,7 +27,7 @@ import ( testlog "github.com/Azure/ARO-RP/test/util/log" ) -const TEST_PULLSPEC = "registry.access.redhat.com/ubi8/go-toolset:1.20.10" +const TEST_PULLSPEC = "registry.access.redhat.com/ubi8/go-toolset:1.20.12-5" var _ = Describe("Podman", Ordered, func() { var err error