From 90b0ae458d81e54733db317c3280b8aae80b1dc6 Mon Sep 17 00:00:00 2001
From: Baptiste Lartigau <22366459+Baplar@users.noreply.github.com>
Date: Wed, 30 Aug 2023 13:43:28 +0200
Subject: [PATCH 1/8] Fix script for installing specific Chrome version with
 APT

When installing a specific version of Chrome on a Debian-based distro, the APT repositories were not refreshed by running `apt-get update` beforehand, leading to the install process failing due to unresolvable dependencies. Adding this update command before the install command fixes the issue.
---
 src/scripts/install-chrome.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/scripts/install-chrome.sh b/src/scripts/install-chrome.sh
index dbefad5..c6ebc73 100644
--- a/src/scripts/install-chrome.sh
+++ b/src/scripts/install-chrome.sh
@@ -108,7 +108,7 @@ else
   if [[ "$ORB_PARAM_CHROME_VERSION" == "latest" ]]; then
     ENV_IS_ARM=$(! dpkg --print-architecture | grep -q arm; echo $?)
     wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | $SUDO apt-key add -
- if [ "$ENV_IS_ARM" == "arm" ]; then
+    if [ "$ENV_IS_ARM" == "arm" ]; then
       echo "Installing Chrome for ARM64"
       $SUDO sh -c 'echo "deb [arch=arm64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list'
     else
@@ -119,6 +119,7 @@ else
     DEBIAN_FRONTEND=noninteractive $SUDO apt-get install -y google-chrome-${ORB_PARAM_CHANNEL}
   else
     # Google does not keep older releases in their PPA, but they can be installed manually. HTTPS should be enough to secure the download.
+    $SUDO apt-get update
     wget --no-verbose -O /tmp/chrome.deb "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${ORB_PARAM_CHROME_VERSION}-1_amd64.deb" \
       && $SUDO apt-get install -y /tmp/chrome.deb \
       && rm /tmp/chrome.deb

From 169b255e404bc93bc85ec23bb98f2986b7eb5e65 Mon Sep 17 00:00:00 2001
From: Mateo Arboleda <mateo.arboleda@circleci.com>
Date: Wed, 27 Nov 2024 10:48:21 -0500
Subject: [PATCH 2/8] Update executors version

---
 .circleci/test-deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml
index 5e8c03a..bef4527 100644
--- a/.circleci/test-deploy.yml
+++ b/.circleci/test-deploy.yml
@@ -205,7 +205,7 @@ executors:
       - image: cimg/openjdk:11.0-browsers
   macos:
     macos:
-      xcode: 13.4.1
+      xcode: 15.3.0
   linux:
     machine:
-      image: ubuntu-2204:2022.04.2
+      image: ubuntu-2204:2024.08.1

From c10948db8ee9b2d714e66bc26db05872b1cab741 Mon Sep 17 00:00:00 2001
From: Mateo Arboleda <mateo.arboleda@circleci.com>
Date: Wed, 27 Nov 2024 10:57:38 -0500
Subject: [PATCH 3/8] Update geckodriver mac version to ARM

---
 src/scripts/install-geckodriver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/install-geckodriver.sh b/src/scripts/install-geckodriver.sh
index 7ffb15d..60283d1 100644
--- a/src/scripts/install-geckodriver.sh
+++ b/src/scripts/install-geckodriver.sh
@@ -34,7 +34,7 @@ grab_geckodriver_version
 installation_check
 
 if uname -a | grep Darwin >>/dev/null 2>&1; then
-  PLATFORM=macos
+  PLATFORM=macos-aarch64
 else
   PLATFORM=linux64
 fi

From 7805399fe64a9d60cff152ef2b8e89d7e87427ab Mon Sep 17 00:00:00 2001
From: Mateo Arboleda <mateo.arboleda@circleci.com>
Date: Wed, 27 Nov 2024 12:53:10 -0500
Subject: [PATCH 4/8] Update chromedriver install

---
 src/scripts/install-chromedriver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/install-chromedriver.sh b/src/scripts/install-chromedriver.sh
index 812046d..e463ad2 100644
--- a/src/scripts/install-chromedriver.sh
+++ b/src/scripts/install-chromedriver.sh
@@ -162,7 +162,7 @@ else
     PLATFORM="mac-x64"
     curl --silent --show-error --location --fail --retry 3 \
       --output chromedriver_$PLATFORM.zip \
-      "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROMEDRIVER_VERSION/mac-x64/chromedriver-mac-x64.zip"
+      "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROMEDRIVER_VERSION/mac-x64/chromedriver-mac-arm64.zip"
   else
     PLATFORM="win64"
     curl --silent --show-error --location --fail --retry 3 \

From 99521df6d4afa1c9f2476e317f2cd597f59b7330 Mon Sep 17 00:00:00 2001
From: Mateo Arboleda <mateo.arboleda@circleci.com>
Date: Wed, 27 Nov 2024 13:42:00 -0500
Subject: [PATCH 5/8] Update mac url chromedriver

---
 src/scripts/install-chromedriver.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/scripts/install-chromedriver.sh b/src/scripts/install-chromedriver.sh
index e463ad2..cc37843 100644
--- a/src/scripts/install-chromedriver.sh
+++ b/src/scripts/install-chromedriver.sh
@@ -9,7 +9,7 @@ if uname -a | grep Darwin >/dev/null 2>&1; then
   else
     CHROME_VERSION="$(/Applications/Google\ Chrome\ Beta.app/Contents/MacOS/Google\ Chrome\ Beta --version)"
   fi
-  PLATFORM=mac64
+  PLATFORM=mac_arm64
 
 elif grep Alpine /etc/issue >/dev/null 2>&1; then
   apk update >/dev/null 2>&1 &&
@@ -125,12 +125,12 @@ if [[ $CHROME_RELEASE -lt 70 ]]; then
     exit 1
     ;;
   esac
-  elif [[ $CHROME_RELEASE -lt 115 ]]; then
-    CHROMEDRIVER_VERSION=$(curl --silent --show-error --location --fail --retry 3 \
-      "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROMEDRIVER_RELEASE")
-  else
-    # shellcheck disable=SC2001
-    CHROMEDRIVER_VERSION=$(echo $CHROME_VERSION | sed 's/[^0-9.]//g')
+elif [[ $CHROME_RELEASE -lt 115 ]]; then
+  CHROMEDRIVER_VERSION=$(curl --silent --show-error --location --fail --retry 3 \
+    "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROMEDRIVER_RELEASE")
+else
+  # shellcheck disable=SC2001
+  CHROMEDRIVER_VERSION=$(echo $CHROME_VERSION | sed 's/[^0-9.]//g')
 fi
 
 # installation check
@@ -162,7 +162,7 @@ else
     PLATFORM="mac-x64"
     curl --silent --show-error --location --fail --retry 3 \
       --output chromedriver_$PLATFORM.zip \
-      "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROMEDRIVER_VERSION/mac-x64/chromedriver-mac-arm64.zip"
+      "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROMEDRIVER_VERSION/mac-arm64/chromedriver-mac-arm64.zip"
   else
     PLATFORM="win64"
     curl --silent --show-error --location --fail --retry 3 \

From b1a538132251de71ab6f0bb8ca28bebdb9385d93 Mon Sep 17 00:00:00 2001
From: Mateo Arboleda <mateo.arboleda@circleci.com>
Date: Wed, 27 Nov 2024 14:03:20 -0500
Subject: [PATCH 6/8] Use a newer version of chrome for test as the older seems
 to be removed from linux distribution

---
 .circleci/test-deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml
index bef4527..91f3f87 100644
--- a/.circleci/test-deploy.yml
+++ b/.circleci/test-deploy.yml
@@ -100,7 +100,7 @@ workflows:
       - int-test-all:
           name: test-specific-version-all
           executor: cimg-base
-          chrome-version: "114.0.5735.90"
+          chrome-version: "131.0.6778.85"
           firefox-version: "90.0.1"
           filters: *filters
       - int-test-all:
@@ -122,7 +122,7 @@ workflows:
       - int-test-chrome:
           name: test-specific-version-chrome
           executor: cimg-base
-          chrome-version: "92.0.4515.131"
+          chrome-version: "131.0.6778.85"
           firefox-version: "90.0.1"
           filters: *filters
       - int-test-chrome:
@@ -143,7 +143,7 @@ workflows:
       - int-test-firefox:
           name: test-specific-version-firefox
           executor: cimg-base
-          chrome-version: "92.0.4515.131"
+          chrome-version: "131.0.6778.85"
           firefox-version: "90.0.1"
           filters: *filters
       - int-test-firefox:

From f9cca7df1bba54c398b228d3d871c19694610c16 Mon Sep 17 00:00:00 2001
From: Mateo Arboleda <mateo.arboleda@circleci.com>
Date: Wed, 27 Nov 2024 14:49:51 -0500
Subject: [PATCH 7/8] Fix condition to install chromedriver

---
 src/scripts/install-chromedriver.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scripts/install-chromedriver.sh b/src/scripts/install-chromedriver.sh
index cc37843..b06c786 100644
--- a/src/scripts/install-chromedriver.sh
+++ b/src/scripts/install-chromedriver.sh
@@ -158,8 +158,8 @@ else
     curl --silent --show-error --location --fail --retry 3 \
     --output chromedriver_$PLATFORM.zip \
     "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROMEDRIVER_VERSION/linux64/chromedriver-linux64.zip"
-  elif [[ $PLATFORM == "mac64" ]]; then
-    PLATFORM="mac-x64"
+  elif [[ $PLATFORM == "mac_arm64" ]]; then
+    PLATFORM="mac_arm64"
     curl --silent --show-error --location --fail --retry 3 \
       --output chromedriver_$PLATFORM.zip \
       "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROMEDRIVER_VERSION/mac-arm64/chromedriver-mac-arm64.zip"

From 20d9ff2ea85cd879075981c51886144dd4301955 Mon Sep 17 00:00:00 2001
From: Mateo Arboleda <mateo.arboleda@circleci.com>
Date: Wed, 27 Nov 2024 15:04:55 -0500
Subject: [PATCH 8/8] Update _ to - on platform for mac

---
 src/scripts/install-chromedriver.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/scripts/install-chromedriver.sh b/src/scripts/install-chromedriver.sh
index b06c786..d62b8a2 100644
--- a/src/scripts/install-chromedriver.sh
+++ b/src/scripts/install-chromedriver.sh
@@ -9,7 +9,7 @@ if uname -a | grep Darwin >/dev/null 2>&1; then
   else
     CHROME_VERSION="$(/Applications/Google\ Chrome\ Beta.app/Contents/MacOS/Google\ Chrome\ Beta --version)"
   fi
-  PLATFORM=mac_arm64
+  PLATFORM=mac-arm64
 
 elif grep Alpine /etc/issue >/dev/null 2>&1; then
   apk update >/dev/null 2>&1 &&
@@ -158,8 +158,8 @@ else
     curl --silent --show-error --location --fail --retry 3 \
     --output chromedriver_$PLATFORM.zip \
     "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROMEDRIVER_VERSION/linux64/chromedriver-linux64.zip"
-  elif [[ $PLATFORM == "mac_arm64" ]]; then
-    PLATFORM="mac_arm64"
+  elif [[ $PLATFORM == "mac-arm64" ]]; then
+    PLATFORM="mac-arm64"
     curl --silent --show-error --location --fail --retry 3 \
       --output chromedriver_$PLATFORM.zip \
       "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROMEDRIVER_VERSION/mac-arm64/chromedriver-mac-arm64.zip"