From 1cb45d0cabe80260cce35feb8edd1b3c4607524c Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 11 Feb 2022 00:38:09 -0800
Subject: [PATCH] Downgrade to Chrome 97

Chrome 98 has a bug with sending control keys that is breaking our
keyboard shortcut tests:
https://bugs.chromium.org/p/chromedriver/issues/detail?id=3999

Prune older Chrome entries as we no longer need them.
---
 .gitlab/ci/gitlab.images.yml |  2 +-
 scripts/custom-docker-build  | 40 ++++--------------------------------
 scripts/install-chrome       |  4 ++--
 3 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml
index 2f07fdf..5609ac0 100644
--- a/.gitlab/ci/gitlab.images.yml
+++ b/.gitlab/ci/gitlab.images.yml
@@ -2,7 +2,7 @@
 .gitlab-matrix:
   variables:
     LFS: '2.9'
-    CHROME: '98'
+    CHROME: '97'
     NODE: '14.15'
     YARN: '1.22'
     GRAPHICSMAGICK: '1.3.36'
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 2023b17..789499e 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -36,46 +36,14 @@ function print_golang_args() {
 # You may need to bump the version in scripts/install-chrome.
 function print_chrome_args() {
     case "$1" in
-        69|69.0)
-            CHROME_VERSION=69.0.3497.81-1
-            CHROME_DRIVER_VERSION=2.41
-            ;;
-        71|71.0)
-            CHROME_VERSION=71.0.3578.98-1
-            CHROME_DRIVER_VERSION=2.45
-            ;;
-        73|73.0)
-            CHROME_VERSION=73.0.3683.103-1
-            CHROME_DRIVER_VERSION=73.0.3683.68
-            ;;
-        74|74.0)
-            CHROME_VERSION=74.0.3729.169-1
-            CHROME_DRIVER_VERSION=74.0.3729.6
-            ;;
-        81|81.0)
-            CHROME_VERSION=81.0.4044.129-1
-            CHROME_DRIVER_VERSION=81.0.4044.69
-            ;;
-        83|83.0)
-            CHROME_VERSION=83.0.4103.61-1
-            CHROME_DRIVER_VERSION=83.0.4103.39
-            ;;
-        84|84.0)
-            CHROME_VERSION=84.0.4147.89-1
-            CHROME_DRIVER_VERSION=84.0.4147.30
-            ;;
-        85|85.0)
-            CHROME_VERSION=85.0.4183.83-1
-            CHROME_DRIVER_VERSION=85.0.4183.87
-            ;;
-        87|87.0)
-            CHROME_VERSION=87.0.4280.88-1
-            CHROME_DRIVER_VERSION=87.0.4280.88
-            ;;
         89|89.0)
             CHROME_VERSION=89.0.4389.90-1
             CHROME_DRIVER_VERSION=89.0.4389.23
             ;;
+        97|97.0)
+            CHROME_VERSION=97.0.4692.99-1
+            CHROME_DRIVER_VERSION=97.0.4692.71
+            ;;
         98|98.0)
             CHROME_VERSION=98.0.4758.80-1
             CHROME_DRIVER_VERSION=98.0.4758.80
diff --git a/scripts/install-chrome b/scripts/install-chrome
index 38f1256..bed2782 100755
--- a/scripts/install-chrome
+++ b/scripts/install-chrome
@@ -3,8 +3,8 @@
 set -xeuo pipefail
 IFS=$'\n\t'
 
-CHROME_VERSION=${1:-66.0.3359.181-1}
-CHROME_DRIVER_VERSION=${2:-2.38}
+CHROME_VERSION=${1:-97.0.4692.99-1}
+CHROME_DRIVER_VERSION=${2:-97.0.4692.71}
 export DEBIAN_FRONTEND=noninteractive
 
 curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add -