Skip to content

Commit 868d06e

Browse files
committed
Fixing ChromeDriver resolution for Beta and Dev
1 parent a27f331 commit 868d06e

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.github/workflows/update-dev-beta-browser-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
5050
- name: Build the Dev/Beta Docker container images
5151
run: |
52-
echo VERSION=$SELENIUM_VERSION make $BROWSER_$CHANNEL standalone_"$BROWSER"_"$CHANNEL"
52+
echo VERSION=$SELENIUM_VERSION make "$BROWSER"_"$CHANNEL" standalone_"$BROWSER"_"$CHANNEL"
5353
VERSION=$SELENIUM_VERSION make "$BROWSER"_"$CHANNEL" standalone_"$BROWSER"_"$CHANNEL"
5454
5555
- name: Test the Dev/Beta Docker container images

NodeChrome/Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ USER root
1010
# Google Chrome
1111
#============================================
1212
# can specify versions by CHROME_VERSION;
13-
# e.g. google-chrome-stable=53.0.2785.101-1
14-
# google-chrome-beta=53.0.2785.92-1
15-
# google-chrome-unstable=54.0.2840.14-1
16-
# latest (equivalent to google-chrome-stable)
17-
# google-chrome-beta (pull latest beta)
13+
# e.g. google-chrome-stable
14+
# google-chrome-beta
15+
# google-chrome-unstable
1816
#============================================
1917
ARG CHROME_VERSION="google-chrome-stable"
2018
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
@@ -45,8 +43,9 @@ RUN if [ ! -z "$CHROME_DRIVER_VERSION" ]; \
4543
else echo "Geting ChromeDriver binary from https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions-with-downloads.json" \
4644
&& CFT_URL=https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions-with-downloads.json \
4745
&& CFT_CHANNEL="Stable" \
48-
&& if [[ $CHROME_VERSION == *"beta"* ]]; then CFT_CHANNEL="Beta"; fi \
49-
&& if [[ $CHROME_VERSION == *"unstable"* ]]; then CFT_CHANNEL="Dev"; fi \
46+
&& if [ "$CHROME_VERSION" = "google-chrome-beta" ]; then CFT_CHANNEL="Beta" ; fi \
47+
&& if [ "$CHROME_VERSION" = "google-chrome-unstable" ]; then CFT_CHANNEL="Dev" ; fi \
48+
&& echo $CFT_CHANNEL \
5049
&& CTF_VALUES=$(curl -sSL $CFT_URL | jq -r --arg CFT_CHANNEL "$CFT_CHANNEL" '.channels[] | select (.channel==$CFT_CHANNEL)') \
5150
&& CHROME_DRIVER_VERSION=$(echo $CTF_VALUES | jq -r '.version' ) \
5251
&& CHROME_DRIVER_URL=$(echo $CTF_VALUES | jq -r '.downloads.chromedriver[] | select(.platform=="linux64") | .url' ) ; \

0 commit comments

Comments
 (0)