From df3983eed5154d61c70c357cc01425155222974e Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 12 Mar 2019 23:41:53 -0400 Subject: [PATCH] fix variables --- appveyor.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index bc7fd04fc7..0b367d0cdf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,10 +19,10 @@ init: install: - ps: | - $packageVersion = (Get-Content -Raw -Path .\src\package.json | ConvertFrom-Json).version - $prodDeploy = $false + $PACKAGE_VERSION = (Get-Content -Raw -Path .\src\package.json | ConvertFrom-Json).version + $PROD_DEPLOY = $false if($env:APPVEYOR_REPO_TAG -eq "true" -and $env:APPVEYOR_RE_BUILD -eq "True") { - $prodDeploy = $true + $PROD_DEPLOY = $true echo "This is a production deployment." } if($isWindows) { @@ -30,7 +30,8 @@ install: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git } - sh: | - if [ "${SNAP_TOKEN}" != "" -a "$prodDeploy" == "false" ] + echo "prod deploy: ${PROD_DEPLOY}" + if [ "${SNAP_TOKEN}" != "" -a "${PROD_DEPLOY}" == "false" ] then echo "login to snap" echo "$SNAP_TOKEN" | snapcraft login --with - @@ -46,23 +47,23 @@ build_script: - ps: | if($isLinux) { npm run dist:lin - Push-AppveyorArtifact ./dist/Bitwarden-${packageVersion}-x86_64.AppImage - Push-AppveyorArtifact ./dist/bitwarden_${packageVersion}_amd64.snap - Push-AppveyorArtifact ./dist/Bitwarden-${packageVersion}-amd64.deb - Push-AppveyorArtifact ./dist/Bitwarden-${packageVersion}-x64.freebsd - Push-AppveyorArtifact ./dist/Bitwarden-${packageVersion}-x86_64.rpm + Push-AppveyorArtifact ./dist/Bitwarden-${PACKAGE_VERSION}-x86_64.AppImage + Push-AppveyorArtifact ./dist/bitwarden_${PACKAGE_VERSION}_amd64.snap + Push-AppveyorArtifact ./dist/Bitwarden-${PACKAGE_VERSION}-amd64.deb + Push-AppveyorArtifact ./dist/Bitwarden-${PACKAGE_VERSION}-x64.freebsd + Push-AppveyorArtifact ./dist/Bitwarden-${PACKAGE_VERSION}-x86_64.rpm } else { npm run dist:win:ci - Push-AppveyorArtifact .\dist\Bitwarden-Portable-${packageVersion}.exe - Push-AppveyorArtifact .\dist\nsis-web\Bitwarden-Installer-${packageVersion}.exe - Push-AppveyorArtifact .\dist\Bitwarden-${packageVersion}-x64.appx - Push-AppveyorArtifact .\dist\Bitwarden-${packageVersion}-ia32.appx + Push-AppveyorArtifact .\dist\Bitwarden-Portable-${PACKAGE_VERSION}.exe + Push-AppveyorArtifact .\dist\nsis-web\Bitwarden-Installer-${PACKAGE_VERSION}.exe + Push-AppveyorArtifact .\dist\Bitwarden-${PACKAGE_VERSION}-x64.appx + Push-AppveyorArtifact .\dist\Bitwarden-${PACKAGE_VERSION}-ia32.appx } after_build: - ps: | - if($prodDeploy) { + if($PROD_DEPLOY) { if($isLinux) { echo "Deploy Linux..." }