Skip to content

USHIFT-7168: Bump Go to 1.26 #6796

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
openshift-merge-bot merged 2 commits into from
Jun 3, 2026
Merged

USHIFT-7168: Bump Go to 1.26 #6796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f44b47
Fix rebase's GO_VER sed
pmtk Jun 3, 2026
44f92ba
Update RPM_BUILDER_IMAGE_TAG to 5.0 + 1.26
pmtk Jun 3, 2026
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ GO_TEST_PACKAGES=./cmd/... ./pkg/...
export CGO_ENABLED ?= 1

# Specify OCP build tools image tag when building rpm with podman
RPM_BUILDER_IMAGE_TAG := rhel-9-golang-1.25-openshift-4.22
RPM_BUILDER_IMAGE_TAG := rhel-9-golang-1.26-openshift-5.0

all: generate-config microshift etcd

Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/rebase_job_entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ fi
# It's before rebase.py because we want this to be part of the rebase PR.
# Go version in go.mods are updated in rebase.sh.
go_version=$(go version 2>/dev/null | awk '{print $3}' | tr -d '[a-z]')
sed -i "s/^GO_VER=.*/GO_VER=${go_version}/" ./scripts/devenv-builder/configure-vm.sh
sed -i "s/GO_VER=.*/GO_VER=${go_version}/" ./scripts/devenv-builder/configure-vm.sh
go_version_xy="$(echo "${go_version}" | cut -f1-2 -d.)"
sed -i "s/^%global golang_version .*/%global golang_version ${go_version_xy}/" ./packaging/rpm/microshift.spec

Expand Down
2 changes: 1 addition & 1 deletion scripts/devenv-builder/configure-vm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ function install_build_deps() {
# run only if booted with systemd
[[ -d /run/systemd/system ]] && sudo systemctl enable --now cockpit.socket

GO_VER=1.24.4
GO_VER=1.26.3
GO_ARCH=$([ "$(uname -m)" == "x86_64" ] && echo "amd64" || echo "arm64")
GO_INSTALL_DIR="/usr/local/go${GO_VER}"
if [ ! -d "${GO_INSTALL_DIR}" ]; then
Expand Down