Skip to content

Commit

Permalink
Update to golang-1.21 from golang-1.20
Browse files Browse the repository at this point in the history
RHEL-9.4 and RHEL-8.10 is released and have golang-1.21 as part of go-toolset, same
with the ubi9/ubi8 go-toolset images. This PR do followingings
- Update github actions to go-1.21
- Use rhel-8-release-golang-1.21-openshift-4.16 image tag instead
  rhel-8-release-golang-1.20-openshift-4.15 because openshift-4.15
  doesn't have golang-1.21 tag.
  • Loading branch information
praveenkumar committed May 23, 2024
1 parent 34074db commit febe474
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/choco-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
os:
- windows-2022
go:
- '1.20'
- '1.21'
steps:
- name: Check out repository code
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- macOS-13
- macOS-12
go:
- '1.20'
- '1.21'
steps:
# Enable tmate debugging of manually-triggered workflows if the input option was provided
- name: Setup tmate session
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/make-check-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- windows-2019
- windows-2022
go:
- '1.20'
- '1.21'
steps:
- name: Check out repository code
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/make-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- ubuntu-latest
- ubuntu-20.04
go:
- '1.20'
- '1.21'
steps:
- name: Check out repository code
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/make-rpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
os:
- ubuntu-latest
go:
- '1.20'
- '1.21'
steps:
- name: Check out repository code
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-okd-bundle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fail-fast: false
matrix:
go:
- '1.20'
- '1.21'
env:
SHELL: /bin/bash
KUBECONFIG: '/Users/runner/.kube/config'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-chocolatey.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
os:
- windows-2022
go:
- '1.20'
- '1.21'
steps:
- name: Check out repository code
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ DOCS_BUILD_TARGET ?= /docs/source/getting_started/master.adoc

GOOS ?= $(shell go env GOOS)
GOARCH ?= $(shell go env GOARCH)
GOVERSION = 1.20
GOVERSION = 1.21

HOST_BUILD_DIR=$(BUILD_DIR)/$(GOOS)-$(GOARCH)
GOPATH ?= $(shell go env GOPATH)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/crc-org/crc/v2

go 1.20
go 1.21

require (
github.com/AlecAivazis/survey/v2 v2.3.7
Expand Down
2 changes: 1 addition & 1 deletion images/build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi8/go-toolset:1.20
FROM registry.access.redhat.com/ubi8/go-toolset:1.21
MAINTAINER CRC <[email protected]>

WORKDIR $APP_ROOT/src
Expand Down
2 changes: 1 addition & 1 deletion images/openshift-ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This Dockerfile is used by openshift CI
# It builds an image containing crc and nss-wrapper for remote deployments, as well as the google cloud-sdk for nested GCE environments.

FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.20-openshift-4.15 AS builder
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.16 AS builder
WORKDIR /go/src/github.com/crc-org/crc
COPY . .
RUN make release
Expand Down
2 changes: 1 addition & 1 deletion tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/crc-org/crc/tools

go 1.20
go 1.21

require (
github.com/cfergeau/gomod2rpmdeps v0.0.0-20210223144124-2042c4850ca8
Expand Down

0 comments on commit febe474

Please sign in to comment.