diff --git a/Makefile b/Makefile index 2661d4ec3b..d4d1a89ddc 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/scripts/auto-rebase/rebase_job_entrypoint.sh b/scripts/auto-rebase/rebase_job_entrypoint.sh index dc68c4698e..0ee366a222 100755 --- a/scripts/auto-rebase/rebase_job_entrypoint.sh +++ b/scripts/auto-rebase/rebase_job_entrypoint.sh @@ -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 diff --git a/scripts/devenv-builder/configure-vm.sh b/scripts/devenv-builder/configure-vm.sh index 51fe80a55d..0a5b6c68e6 100755 --- a/scripts/devenv-builder/configure-vm.sh +++ b/scripts/devenv-builder/configure-vm.sh @@ -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