From d4de7d805bb7e65b8f021711b1ba88522cbe3d78 Mon Sep 17 00:00:00 2001 From: Daniel Rozenberg Date: Mon, 2 Dec 2024 13:06:54 -0500 Subject: [PATCH] Revert workaround for setting CHROME_VERSION in CircleCI --- .circleci/config.yml | 4 ++-- .circleci/get_pinned_chrome_version.sh | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 982475dddac0..960ca5072161 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - browser-tools: circleci/browser-tools@1.4.8 + browser-tools: circleci/browser-tools@1.4.9 codecov: codecov/codecov@5.0.0 macos: circleci/macos@2.5.2 node: circleci/node@6.3.0 @@ -174,7 +174,7 @@ commands: name: '💿 Update list of available apt packages' command: sudo apt update - browser-tools/install-chrome: - # chrome-version is set in ./.circleci/get_pinned_chrome_version.sh, see files for details. + chrome-version: ${CHROME_VERSION} replace-existing: true - browser-tools/install-chromedriver install_firefox: diff --git a/.circleci/get_pinned_chrome_version.sh b/.circleci/get_pinned_chrome_version.sh index 51b6ff9b3445..d96c0a73ae9b 100755 --- a/.circleci/get_pinned_chrome_version.sh +++ b/.circleci/get_pinned_chrome_version.sh @@ -48,7 +48,3 @@ echo "$(GREEN "Chrome version history URL is") $(CYAN "${CHROME_VERSION_HISTORY_ echo "$(GREEN "Determining Chrome version...")" CHROME_VERSION="$(curl -sS --retry 3 ${CHROME_VERSION_HISTORY_URL} | jq -r ".versions[]|.version" | grep -m 1 "${CHROME_MAJOR_VERSION}\.[[:digit:]]\+.[[:digit:]]\+.[[:digit:]]\+")" echo "$(GREEN "Chrome version is") $(CYAN "${CHROME_VERSION}")" - -# Workaround for https://github.com/CircleCI-Public/browser-tools-orb/issues/70 -echo "export ORB_PARAM_CHROME_VERSION=$CHROME_VERSION" >> $BASH_ENV -echo $(GREEN "Successfully determined pinned version of Chrome")