From cc54f85744742356c1436838929271b0be1628fe Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 12 Mar 2019 12:52:59 -0400 Subject: [PATCH] move linux build to ps --- appveyor.yml | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 63d2ac6a99..d442c416f3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,21 +6,25 @@ branches: except: - l10n_master -environment: - APPVEYOR_YML_DISABLE_PS_LINUX: true - services: - docker stack: node 10 init: -- ps: Install-Product node $env:nodejs_version +- ps: | + if($isWindows) { + Install-Product node 10 + } install: -- ps: choco install cloc --no-progress -- ps: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git -- ps: $env:package_version = (Get-Content -Raw -Path package.json | ConvertFrom-Json).version +- sh: sudo apt-get install pkg-config libxss-dev libsecret-1-dev rpm +- ps: $env:package_version = (Get-Content -Raw -Path .\src\package.json | ConvertFrom-Json).version +- ps: | + if($isWindows) { + choco install cloc --no-progress + cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git + } before_build: - node --version @@ -28,10 +32,15 @@ before_build: build_script: - npm install -- sh: npm run build:prod +- sh: npm run dist:lin - ps: npm run dist:win:ci - ps: | - Push-AppveyorArtifact .\dist\Bitwarden-Portable-$env:package_version.exe - Push-AppveyorArtifact .\dist\nsis-web\Bitwarden-Installer-$env:package_version.exe - Push-AppveyorArtifact .\dist\Bitwarden-$env:package_version-x64.appx - Push-AppveyorArtifact .\dist\Bitwarden-$env:package_version-ia32.appx + if($isLinux) { + + } + else { + Push-AppveyorArtifact .\dist\Bitwarden-Portable-$env:package_version.exe + Push-AppveyorArtifact .\dist\nsis-web\Bitwarden-Installer-$env:package_version.exe + Push-AppveyorArtifact .\dist\Bitwarden-$env:package_version-x64.appx + Push-AppveyorArtifact .\dist\Bitwarden-$env:package_version-ia32.appx + }