Skip to content

Commit

Permalink
Fix chrome finder on linux/osx when process.env isn't populated (#2687)
Browse files Browse the repository at this point in the history
  • Loading branch information
wardpeet authored and paulirish committed Jul 19, 2017
1 parent 425b5fb commit 112c2c7
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ install:
before_script:
- gem install travis-artifacts
- export DISPLAY=:99.0
- export LIGHTHOUSE_CHROMIUM_PATH="$(pwd)/chrome-linux/chrome"
- export CHROME_PATH="$(pwd)/chrome-linux/chrome"
- sh -e /etc/init.d/xvfb start
- sleep 3 # wait for xvfb to boot
- yarn build-all
Expand Down
25 changes: 19 additions & 6 deletions chrome-launcher/chrome-finder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,17 @@ export function darwin() {
{regex: /^\/Applications\/.*Chrome Canary.app/, weight: 101},
{regex: /^\/Volumes\/.*Chrome.app/, weight: -2},
{regex: /^\/Volumes\/.*Chrome Canary.app/, weight: -1},
{regex: new RegExp(process.env.LIGHTHOUSE_CHROMIUM_PATH), weight: 150},
{regex: new RegExp(process.env.CHROME_PATH), weight: 151}
];
// clang-format on

if (process.env.LIGHTHOUSE_CHROMIUM_PATH) {
priorities.push({regex: new RegExp(process.env.LIGHTHOUSE_CHROMIUM_PATH), weight: 150});
}

if (process.env.CHROME_PATH) {
priorities.push({regex: new RegExp(process.env.CHROME_PATH), weight: 151});
}

// clang-format on
return sort(installations, priorities);
}

Expand Down Expand Up @@ -124,12 +130,19 @@ export function linux() {
}

const priorities: Priorities = [
{regex: /chrome-wrapper$/, weight: 51}, {regex: /google-chrome-stable$/, weight: 50},
{regex: /chrome-wrapper$/, weight: 51},
{regex: /google-chrome-stable$/, weight: 50},
{regex: /google-chrome$/, weight: 49},
{regex: new RegExp(process.env.LIGHTHOUSE_CHROMIUM_PATH), weight: 100},
{regex: new RegExp(process.env.CHROME_PATH), weight: 101}
];

if (process.env.LIGHTHOUSE_CHROMIUM_PATH) {
priorities.push({regex: new RegExp(process.env.LIGHTHOUSE_CHROMIUM_PATH), weight: 100});
}

if (process.env.CHROME_PATH) {
priorities.push({regex: new RegExp(process.env.CHROME_PATH), weight: 101});
}

return sort(uniq(installations.filter(Boolean)), priorities);
}

Expand Down

0 comments on commit 112c2c7

Please sign in to comment.