From f962c0db0e4934715d4bbce41c2220e6cc8bc1ec Mon Sep 17 00:00:00 2001 From: Daniel Rozenberg Date: Tue, 25 Apr 2023 01:51:55 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=97=20Update=20CircleCI=20Orbs=20versi?= =?UTF-8?q?ons=20(#38811)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update CircleCI Orbs versions * Explicitly set `ORB_PARAM_CHROME_VERSION` env variable in shell script (workaround for https://github.com/CircleCI-Public/browser-tools-orb/issues/70) --- .circleci/config.yml | 8 ++++---- .circleci/get_pinned_chrome_version.sh | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 053960297a15..1f8948df38a9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,9 +1,9 @@ version: 2.1 orbs: - browser-tools: circleci/browser-tools@1.2.3 - codecov: codecov/codecov@3.2.3 - node: circleci/node@5.0.3 + browser-tools: circleci/browser-tools@1.4.1 + codecov: codecov/codecov@3.2.4 + node: circleci/node@5.1.0 push_and_pr_builds: &push_and_pr_builds filters: @@ -133,7 +133,7 @@ commands: name: 'Get Pinned Chrome Version' command: ./.circleci/get_pinned_chrome_version.sh - browser-tools/install-chrome: - chrome-version: ${CHROME_VERSION} + # chrome-version is set in ./.circleci/get_pinned_chrome_version.sh, see files for details. 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 b9c6eaec97ab..51b6ff9b3445 100755 --- a/.circleci/get_pinned_chrome_version.sh +++ b/.circleci/get_pinned_chrome_version.sh @@ -49,5 +49,6 @@ 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}")" -echo "export CHROME_VERSION=$CHROME_VERSION" >> $BASH_ENV +# 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")