From badb18b8f3e6b18c2317631f358d71991e75e7e6 Mon Sep 17 00:00:00 2001
From: Martin Mulholland <71444914+mmulholla@users.noreply.github.com>
Date: Wed, 1 Nov 2023 18:39:58 -0400
Subject: [PATCH 1/2] fix bad code to fetch toolchain-e2e branch (#367)

---
 make/test.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/make/test.mk b/make/test.mk
index 4c620733..e0bd275e 100644
--- a/make/test.mk
+++ b/make/test.mk
@@ -59,12 +59,10 @@ ifeq ($(E2E_REPO_PATH),"")
 		if [[ -n "${REMOTE_E2E_BRANCH}" ]]; then \
 			git config --global user.email "devtools@redhat.com"; \
 			git config --global user.name "Devtools"; \
-			# retrieve the branch name \
-			BRANCH_NAME=`echo ${BRANCH_REF} | awk -F'/' '{print $$3}'`; \
 			# add the user's fork as remote repo \
 			git --git-dir=${E2E_REPO_PATH}/.git --work-tree=${E2E_REPO_PATH} remote add external ${AUTHOR_LINK}/toolchain-e2e.git; \
-			# fetch the branch \
-			git --git-dir=${E2E_REPO_PATH}/.git --work-tree=${E2E_REPO_PATH} fetch external ${BRANCH_REF}; \
+		 	# fetch the branch \
+			git --git-dir=${E2E_REPO_PATH}/.git --work-tree=${E2E_REPO_PATH} fetch external ${REMOTE_E2E_BRANCH}; \
 			# merge the branch with master \
 			git --git-dir=${E2E_REPO_PATH}/.git --work-tree=${E2E_REPO_PATH} merge --allow-unrelated-histories --no-commit FETCH_HEAD; \
 		fi;

From 3d66cb33031e62543a58332f27708fbf1c5e9394 Mon Sep 17 00:00:00 2001
From: Kanika Rana <46766610+ranakan19@users.noreply.github.com>
Date: Tue, 14 Nov 2023 11:25:26 -0500
Subject: [PATCH 2/2] upgrade golang to 1.20 (#369)

* upgrade golang to 1.20

* update readme
---
 .github/workflows/ci-build.yml                        | 4 ++--
 .github/workflows/operator-cd.yml                     | 2 +-
 .github/workflows/publish-operators-for-e2e-tests.yml | 2 +-
 README.adoc                                           | 2 +-
 go.mod                                                | 2 +-
 openshift-ci/Dockerfile.tools                         | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index cbd1a9bc..6396329e 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.19.x
+        go-version: 1.20.x
     
     - name: Checkout code
       uses: actions/checkout@v4
@@ -42,7 +42,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.19.x
+        go-version: 1.20.x
         
     - name: Checkout code
       uses: actions/checkout@v4
diff --git a/.github/workflows/operator-cd.yml b/.github/workflows/operator-cd.yml
index 9ad4d493..22d24da5 100644
--- a/.github/workflows/operator-cd.yml
+++ b/.github/workflows/operator-cd.yml
@@ -7,7 +7,7 @@ on:
       - '*.*'
 env:
   GOPATH: /tmp/go
-  GO_VERSION: 1.19.x
+  GO_VERSION: 1.20.x
 
 jobs:
   binary:
diff --git a/.github/workflows/publish-operators-for-e2e-tests.yml b/.github/workflows/publish-operators-for-e2e-tests.yml
index c5229278..40189bda 100644
--- a/.github/workflows/publish-operators-for-e2e-tests.yml
+++ b/.github/workflows/publish-operators-for-e2e-tests.yml
@@ -7,7 +7,7 @@ on:
 
 env:
   GOPATH: /tmp/go
-  GO_VERSION: 1.19.x
+  GO_VERSION: 1.20.x
 
 jobs:
   binary:
diff --git a/README.adoc b/README.adoc
index bbde6a60..796e7142 100644
--- a/README.adoc
+++ b/README.adoc
@@ -9,7 +9,7 @@ This is the Developer Sandbox Registration Service repository. It implements the
 
 == Build
 
-Requires Go version 1.19.x (1.19.7 or higher) - download for your development environment https://golang.org/dl/[here].
+Requires Go version 1.20.x (1.20.11 or higher) - download for your development environment https://golang.org/dl/[here].
 
 This repository uses https://github.com/golang/go/wiki/Modules[Go modules].
 
diff --git a/go.mod b/go.mod
index dfd1040c..1eeafc9b 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/codeready-toolchain/registration-service
 
-go 1.19
+go 1.20
 
 require (
 	github.com/aws/aws-sdk-go v1.44.100
diff --git a/openshift-ci/Dockerfile.tools b/openshift-ci/Dockerfile.tools
index 26c493bd..e2415e65 100644
--- a/openshift-ci/Dockerfile.tools
+++ b/openshift-ci/Dockerfile.tools
@@ -9,8 +9,8 @@ ENV LANG=en_US.utf8 \
     PATH=$PATH:$GOPATH/bin \
     GIT_COMMITTER_NAME=devtools \
     GIT_COMMITTER_EMAIL=devtools@redhat.com \
-    GOLANG_VERSION=go1.19.7 \
-    GOLANG_SHA256=7a75720c9b066ae1750f6bcc7052aba70fa3813f4223199ee2a2315fd3eb533d
+    GOLANG_VERSION=go1.20.11 \
+    GOLANG_SHA256=ef79a11aa095a08772d2a69e4f152f897c4e96ee297b0dc20264b7dec2961abe
 
 ARG GO_PACKAGE_PATH=github.com/codeready-toolchain/registration-service