1
0
mirror of https://github.com/bitwarden/browser synced 2024-12-25 01:22:26 +01:00

fix build and run on os matrix

This commit is contained in:
Kyle Spearrin 2020-07-23 17:13:57 -04:00
parent f7ae8532b9
commit 1fb95726ef
2 changed files with 13 additions and 3 deletions

View File

@ -20,7 +20,11 @@ jobs:
build:
runs-on: windows-latest
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
steps:
- name: Set up Node
@ -48,7 +52,7 @@ jobs:
- name: Run tests
run: npm run test
- name: Upload test coverage
- name: Upload test coverage artifact
uses: actions/upload-artifact@v2-preview
with:
name: test-coverage

View File

@ -74,9 +74,15 @@ module.exports = (config) => {
removeBrowser('Opera');
removeBrowser('SafariTechPreview');
if (process.env.APPVEYOR === 'True') {
var ci = process.env.CI === 'True' || process.env.CI === 'true';
var githubAction = process.env.GITHUB_WORKFLOW != null && process.env.GITHUB_WORKFLOW !== '';
var appveyor = process.env.APPVEYOR === 'True';
if (githubAction || appveyor) {
removeBrowser('Edge');
}
if (githubAction) {
removeBrowser('Firefox');
}
return result;
}