[ci/chromedriver] update chromedriver cache paths to match most recent snapshots

This commit is contained in:
Spencer 2019-03-09 14:55:58 -08:00 committed by spalger
parent dad2c0f423
commit 3dadece427
2 changed files with 4 additions and 6 deletions

View file

@ -12,9 +12,7 @@ node scripts/es snapshot --download-only;
node scripts/es snapshot --license=oss --download-only;
# download reporting browsers
cd "x-pack";
yarn gulp prepare;
cd -;
(cd "x-pack" && yarn gulp prepare);
# cache the chromedriver bin
chromedriverDistVersion="$(node -e "console.log(require('chromedriver').version)")"

View file

@ -105,11 +105,11 @@ export PATH="$PATH:$yarnGlobalDir"
###
### use the chromedriver cache if it exists
###
if [ -d "$dir/.chromedriver/master" ]; then
if [ -d "$dir/.chromedriver" ]; then
branchPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.chromedriver)")"
cachedPkgVersion="$(cat "$dir/.chromedriver/master/pkgVersion")"
cachedPkgVersion="$(cat "$dir/.chromedriver/pkgVersion")"
if [ "$cachedPkgVersion" == "$branchPkgVersion" ]; then
export CHROMEDRIVER_FILEPATH="$dir/.chromedriver/master/chromedriver.zip"
export CHROMEDRIVER_FILEPATH="$dir/.chromedriver/chromedriver.zip"
export CHROMEDRIVER_SKIP_DOWNLOAD=true
echo " -- Using chromedriver cache at $CHROMEDRIVER_FILEPATH"
else