Merge pull request #202 from nanasess/master

Merge from master branch to v2
nanasess · Aug 4, 2023 · fab7b9a · fab7b9a
2 parents bb2adea + 69cc01d
commit fab7b9a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, ubuntu-20.04, macos-latest, macos-11 ]
         branch:
-          - 'master'
+          # - 'master'
           - 'now'
         chrome_version:
           - 'current'
@@ -80,7 +80,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, ubuntu-20.04, macos-latest, macos-11 ]
         branch:
-          - 'master'
+          # - 'master'
           - 'now'
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -22,7 +22,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows-latest, windows-2019 ]
-        branch: [ 'master', 'now' ]
+        branch:
+          # - 'master'
+          - 'now'
     steps:
     - uses: actions/checkout@v3
     - shell: pwsh
@@ -69,7 +71,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows-latest, windows-2019 ]
-        branch: [ 'master', 'now' ]
+        branch:
+          # - 'master'
+          - 'now'
     steps:
     - uses: actions/checkout@v3
     - shell: pwsh

diff --git a/lib/setup-chromedriver.sh b/lib/setup-chromedriver.sh
@@ -62,6 +62,12 @@ else
 
     echo "Installing ChromeDriver $VERSION for $ARCH"
     URL=$(curl  --location --fail --retry 10 https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json | jq -r ".versions[] | select(.version == \"${VERSION}\") | .downloads.chromedriver[] | select(.platform == \"${ARCH}\") | .url")
+    if [ "$URL" == "" ]; then
+        echo "Fallback to latest version of ChromeDriver for $ARCH"
+        VERSION=$(curl  --location --fail --retry 10 https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json | jq -r ".versions[] | select(.version | startswith(\"$(echo $VERSION | cut -d '.' -f1-3).\")) | .version" | tail -1)
+        URL=$(curl  --location --fail --retry 10 https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json | jq -r ".versions[] | select(.version == \"${VERSION}\") | .downloads.chromedriver[] | select(.platform == \"${ARCH}\") | .url")
+        echo "Installing ChromeDriver $VERSION for $ARCH"
+    fi
     echo "Downloading $URL"
     curl --location --fail --retry 10 -O "$URL"
     unzip -o -q chromedriver-${ARCH}.zip

diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@types/jest": "^27.4.1",
-    "@types/node": "^20.4.4",
+    "@types/node": "^20.4.5",
     "@types/selenium-webdriver": "^4.1.15",
     "@types/semver": "^7.3.13",
     "@types/yauzl": "^2.10.0",
@@ -42,7 +42,7 @@
     "jest": "^27.5.1",
     "jest-circus": "^29.6.1",
     "prettier": "^3.0.0",
-    "selenium-webdriver": "^4.10.0",
+    "selenium-webdriver": "^4.11.0",
     "ts-jest": "^27.1.3",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"

diff --git a/yarn.lock b/yarn.lock
@@ -1132,10 +1132,10 @@
     jest-matcher-utils "^27.0.0"
     pretty-format "^27.0.0"
 
-"@types/node@*", "@types/node@^20.4.4":
-  version "20.4.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.4.tgz#c79c7cc22c9d0e97a7944954c9e663bcbd92b0cb"
-  integrity sha512-CukZhumInROvLq3+b5gLev+vgpsIqC2D0deQr/yS1WnxvmYLlJXZpaQrQiseMY+6xusl79E04UjWoqyr+t1/Ew==
+"@types/node@*", "@types/node@^20.4.5":
+  version "20.4.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.5.tgz#9dc0a5cb1ccce4f7a731660935ab70b9c00a5d69"
+  integrity sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==
 
 "@types/prettier@^2.1.5":
   version "2.4.4"
@@ -3205,10 +3205,10 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-selenium-webdriver@^4.10.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.10.0.tgz#0508cdfbb5ad8470d8fd19db1a69d3e87f474b79"
-  integrity sha512-hSQPw6jgc+ej/UEcdQPG/iBwwMeCEgZr9HByY/J8ToyXztEqXzU9aLsIyrlj1BywBcStO4JQK/zMUWWrV8+riA==
+selenium-webdriver@^4.11.0:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.11.0.tgz#12861e762cbaafe8bd5eec228f00b90256e63f30"
+  integrity sha512-0d/Iys9IroN48BC437/8bSd92lYm0eOJJBN5/fBobKvzVEfQpvVoSnV0NDkUciq2Ek4dLnoVqdT+Q0fzdMi6UA==
   dependencies:
     jszip "^3.10.1"
     tmp "^0.2.1"