From 8e9e818c43fb9cca18101daaf945ec4d2b4a2420 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 10 Jun 2019 14:10:14 -0400 Subject: [PATCH] fixes for appveyor --- appveyor.yml | 4 ++-- src/Android/ci-build-apks.ps1 | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0436db34c..30711626d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -56,7 +56,7 @@ before_build: - cmd: IF DEFINED KEYSTORE_DEC_SECRET nuget install secure-file -ExcludeVersion - cmd: IF DEFINED GOOGLE_SERVICES_DEC_SECRET secure-file\tools\secure-file -decrypt src\Android\google-services.json.enc -secret %GOOGLE_SERVICES_DEC_SECRET% -after_build: +build_script: - sh: | cd store chmod 600 fdroid/config.py keystore.jks @@ -90,7 +90,7 @@ on_success: npm run deploy fi - cmd: IF DEFINED PLAY_DEC_SECRET secure-file\tools\secure-file -decrypt store\google\Publisher\play_creds.json.enc -secret %PLAY_DEC_SECRET% -- cmd: IF DEFINED PLAY_DEC_SECRET dotnet store\google\Publisher\bin\Release\netcoreapp2.0\Publisher.dll %APPVEYOR_BUILD_FOLDER%\store\google\Publisher\play_creds.json %APPVEYOR_BUILD_FOLDER%\com.x8bit.bitwarden-%APPVEYOR_BUILD_NUMBER%.apk alpha +- cmd: IF DEFINED PLAY_DEC_SECRET dotnet store\google\Publisher\bin\Release\netcoreapp2.0\Publisher.dll %APPVEYOR_BUILD_FOLDER%\store\google\Publisher\play_creds.json %APPVEYOR_BUILD_FOLDER%\com.x8bit.bitwarden.apk alpha on_finish: - sh: | diff --git a/src/Android/ci-build-apks.ps1 b/src/Android/ci-build-apks.ps1 index cff95c22a..6decbad62 100644 --- a/src/Android/ci-build-apks.ps1 +++ b/src/Android/ci-build-apks.ps1 @@ -22,8 +22,9 @@ $secureFilePath = $($rootPath + "\secure-file\tools\secure-file.exe"); Invoke-Expression "& `"$secureFilePath`" -decrypt $($encKeystorePath) -secret $($env:keystore_dec_secret)" -echo "##### Sign Release Configuration" +echo "##### Build and Sign Release Configuration" +msbuild "$($androidPath)" "/logger:C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" "/p:Configuration=Release" msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=Release" "/p:AndroidKeyStore=true" "/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:keystore_password)" "/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=$($env:keystore_password)" "/v:quiet" echo "##### Copy Release apk to project root"