From 1ecac04f873f00a3635cd6dcb074d6edbfe12907 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 12 May 2022 17:31:07 -0700
Subject: [PATCH] Update Git, Golang, and Chrome versions for GitLab build
 images

The Chrome update is needed to match the version bump for QA-related
images:
https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/536
---
 .gitlab/ci/gitlab.images.yml    |  7 +++----
 .gitlab/ci/kas.images.yml       |  2 +-
 scripts/lib/custom-docker-build | 36 ++++++++++++---------------------
 3 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml
index 991ac48..98a3da8 100644
--- a/.gitlab/ci/gitlab.images.yml
+++ b/.gitlab/ci/gitlab.images.yml
@@ -11,12 +11,11 @@ gitlab:
     matrix:
       - DEBIAN: ['bullseye']
         RUBY: ['2.7.patched', '3.0.patched']
-        GIT: ['2.33']
+        GIT: ['2.36']
         POSTGRESQL: ['11', '12', '13']
-        GOLANG: ['1.16', '1.17']
+        GOLANG: ['1.17', '1.18']
         NODE: ['16.14']
-        CHROME: ['94', '99']
-  
+        CHROME: ['94', '101']
 
 # Used by GitLab's compile-production-assets and compile-test-assets jobs
 gitlab-assets:
diff --git a/.gitlab/ci/kas.images.yml b/.gitlab/ci/kas.images.yml
index 106fe87..51543b0 100644
--- a/.gitlab/ci/kas.images.yml
+++ b/.gitlab/ci/kas.images.yml
@@ -9,7 +9,7 @@ gitlab-kas:
     NODE: '14.15'
     YARN: '1.22'
     GRAPHICSMAGICK: '1.3.36'
-    GIT: '2.31'
+    GIT: '2.36'
     POSTGRESQL: '12'
   parallel:
     matrix:
diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build
index a8e83bf..3499b75 100755
--- a/scripts/lib/custom-docker-build
+++ b/scripts/lib/custom-docker-build
@@ -9,25 +9,20 @@ function print_golang_args() {
     declare -A GOLANG_DOWNLOAD_SHA256
 
     case "$1" in
-        1.14)
-            INSTALL_GOLANG_VERSION=1.14.15
-            GOLANG_DOWNLOAD_SHA256[amd64]=c64a57b374a81f7cf1408d2c410a28c6f142414f1ffa9d1062de1d653b0ae0d6
-            GOLANG_DOWNLOAD_SHA256[arm64v8]=4d964166a189c22032521c63935437c304bb7f01673b196898cff525897a1c27
-            ;;
-        1.15)
-            INSTALL_GOLANG_VERSION=1.15.10
-            GOLANG_DOWNLOAD_SHA256[amd64]=4aa1267517df32f2bf1cc3d55dfc27d0c6b2c2b0989449c96dd19273ccca051d
-            GOLANG_DOWNLOAD_SHA256[arm64v8]=ca3f3e84d863d8e758bfaab65430b12b6cff8f5a5648139245321d3401da64a7
-            ;;
         1.16)
             INSTALL_GOLANG_VERSION=1.16.12
             GOLANG_DOWNLOAD_SHA256[amd64]=7d657e86493ac1d5892f340a7d88b862b12edb5ac6e73c099e8e0668a6c916b7
             GOLANG_DOWNLOAD_SHA256[arm64v8]=7dbf50ab2e665ecd6c86a3f1ce8c04f7167f9895b91921e25cf1bdc1cb9b5fd7
             ;;
         1.17)
-            INSTALL_GOLANG_VERSION=1.17.9
-            GOLANG_DOWNLOAD_SHA256[amd64]=9dacf782028fdfc79120576c872dee488b81257b1c48e9032d122cfdb379cca6
-            GOLANG_DOWNLOAD_SHA256[arm64v8]=44dcdcd4f0fa6f83c15ef70b31580f1e3f95895c2f11a00e36c440c3554b6ad5
+            INSTALL_GOLANG_VERSION=1.17.10
+            GOLANG_DOWNLOAD_SHA256[amd64]=87fc728c9c731e2f74e4a999ef53cf07302d7ed3504b0839027bd9c10edaa3fd
+            GOLANG_DOWNLOAD_SHA256[arm64v8]=649141201efa7195403eb1301b95dc79c5b3e65968986a391da1370521701b0c
+            ;;
+        1.18)
+            INSTALL_GOLANG_VERSION=1.18.2
+            GOLANG_DOWNLOAD_SHA256[amd64]=e54bec97a1a5d230fc2f9ad0880fcbabb5888f30ed9666eca4a91c5a32e86cbc
+            GOLANG_DOWNLOAD_SHA256[arm64v8]=fc4ad28d0501eaa9c9d6190de3888c9d44d8b5fb02183ce4ae93713f67b8a35b
             ;;
         *) echo "Unknown golang version $1"; exit 1;
     esac
@@ -67,19 +62,14 @@ function print_chrome_args() {
 # see https://www.kernel.org/pub/software/scm/git
 function print_git_args() {
     case "$1" in
-        2.29)
-            GIT_VERSION=2.29.0
-            GIT_DOWNLOAD_SHA256=fa08dc8424ef80c0f9bf307877f9e2e49f1a6049e873530d6747c2be770742ff
-            ;;
-        2.31)
-            GIT_VERSION=2.31.1
-            GIT_DOWNLOAD_SHA256=46d37c229e9d786510e0c53b60065704ce92d5aedc16f2c5111e3ed35093bfa7
-            ;;
-	    2.33)
+        2.33)
             GIT_VERSION=2.33.1
             GIT_DOWNLOAD_SHA256=02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d
             ;;
-
+        2.36)
+            GIT_VERSION=2.36.1
+            GIT_DOWNLOAD_SHA256=37d936fd17c81aa9ddd3dba4e56e88a45fa534ad0ba946454e8ce818760c6a2c
+            ;;
         *) echo "Unknown git version $1"; exit 1;
     esac