build matrix, remove linux from travis ci

This commit is contained in:
Kyle Spearrin 2019-03-12 14:28:32 -04:00
parent d2085f6ff0
commit 51b206b07b
2 changed files with 24 additions and 25 deletions

View File

@ -1,20 +1,9 @@
matrix: matrix:
include: include:
- os: linux
dist: trusty
sudo: true
language: node_js
node_js: 9
install:
- sudo apt-get install pkg-config libxss-dev libsecret-1-dev rpm
- npm install
script:
- npm run build
- os: osx - os: osx
osx_image: xcode9.2 osx_image: xcode9.2
language: node_js language: node_js
node_js: 9 node_js: 10
install: install:
- npm install - npm install
script: script:

View File

@ -8,15 +8,7 @@ branches:
stack: node 10 stack: node 10
init:
- ps: |
if($isWindows) {
Install-Product node 10
}
install: install:
- sh: sudo apt-get update
- sh: sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev rpm
- ps: $env:package_version = (Get-Content -Raw -Path .\src\package.json | ConvertFrom-Json).version - ps: $env:package_version = (Get-Content -Raw -Path .\src\package.json | ConvertFrom-Json).version
- ps: | - ps: |
if($isWindows) { if($isWindows) {
@ -34,7 +26,7 @@ build_script:
if($isLinux) { if($isLinux) {
npm run dist:lin npm run dist:lin
Push-AppveyorArtifact ./dist/Bitwarden-$env:package_version-x86_64.AppImage Push-AppveyorArtifact ./dist/Bitwarden-$env:package_version-x86_64.AppImage
Push-AppveyorArtifact ./dist/bitwarden_$env:package_version_amd64.snap Push-AppveyorArtifact ./dist/bitwarden_${env:package_version}_amd64.snap
Push-AppveyorArtifact ./dist/Bitwarden-$env:package_version-amd64.deb Push-AppveyorArtifact ./dist/Bitwarden-$env:package_version-amd64.deb
Push-AppveyorArtifact ./dist/Bitwarden-$env:package_version-x64.freebsd Push-AppveyorArtifact ./dist/Bitwarden-$env:package_version-x64.freebsd
Push-AppveyorArtifact ./dist/Bitwarden-$env:package_version-x86_64.rpm Push-AppveyorArtifact ./dist/Bitwarden-$env:package_version-x86_64.rpm
@ -47,7 +39,25 @@ build_script:
Push-AppveyorArtifact .\dist\Bitwarden-$env:package_version-ia32.appx Push-AppveyorArtifact .\dist\Bitwarden-$env:package_version-ia32.appx
} }
cache: for:
- '~/.cache/electron -> appveyor.yml' - matrix:
- '~/.cache/electron-builder -> appveyor.yml' only:
- '%USERPROFILE%\.electron -> appveyor.yml' - image: Visual Studio 2017
init:
- ps: Install-Product node 10
cache:
- '%USERPROFILE%\.electron -> appveyor.yml'
- matrix:
only:
- image: Ubuntu1804
init:
- sh: sudo apt-get update
- sh: sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev rpm
cache:
- '/home/appveyor/.cache/electron -> appveyor.yml'
- '/home/appveyor/.cache/electron-builder -> appveyor.yml'