[go: nahoru, domu]

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

misc: use CHROME_PATH variable in CI and scripts #9202

Merged
merged 2 commits into from
Jun 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ install:

before_test:
- set "PATH=C:\MinGW\msys\1.0\bin;%PATH%"
- set "LIGHTHOUSE_CHROMIUM_PATH=%CD%\chrome-win32\chrome.exe"
- set "CHROME_PATH=%CD%\chrome-win32\chrome.exe"
- bash ./lighthouse-core/scripts/download-chrome.sh
- yarn build-all

Expand Down
6 changes: 3 additions & 3 deletions lighthouse-core/scripts/download-chrome.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ else
url="https://download-chromium.appspot.com/dl/Linux_x64?type=snapshots"
fi

if [ x"$LIGHTHOUSE_CHROMIUM_PATH" == x ]; then
echo "Error: Environment variable LIGHTHOUSE_CHROMIUM_PATH not set"
if [ x"$CHROME_PATH" == x ]; then
echo "Error: Environment variable CHROME_PATH not set"
exit 1
fi

if [ -e "$LIGHTHOUSE_CHROMIUM_PATH" ]; then
if [ -e "$CHROME_PATH" ]; then
echo "cached chrome found"
else
wget "$url" --no-check-certificate -q -O chrome.zip && unzip -q chrome.zip
Expand Down