From fdfd2d20e6dfb9c2c3d1152c03c765bd1e45e91a Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 3 Jun 2019 23:54:40 -0400 Subject: [PATCH] fdroid builds --- appveyor.yml | 8 ++++---- src/Android/ci-build-apks.ps1 | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f23076813..51d507c8b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,9 +2,9 @@ # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) #on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) -#install: -# - choco install cloc --no-progress -# - "cloc --vcs git --exclude-dir Resources,store,test,UWP,Properties --include-lang C#,JavaScript,TypeScript,PowerShell" +install: + - choco install cloc --no-progress + - "cloc --vcs git --exclude-dir Resources,store,test,UWP,Properties --include-lang C#,JavaScript,TypeScript,PowerShell" # - appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/latest/nuget.exe # - appveyor DownloadFile https://aka.ms/vs/15/release/vs_community.exe # - vs_community.exe update --wait --quiet --norestart --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community" @@ -20,7 +20,7 @@ on_success: - 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 artifacts: - path: com.x8bit.bitwarden-%APPVEYOR_BUILD_NUMBER%.apk -# - path: com.x8bit.bitwarden-fdroid-%APPVEYOR_BUILD_NUMBER%.apk + - path: com.x8bit.bitwarden-fdroid-%APPVEYOR_BUILD_NUMBER%.apk branches: except: - l10n_master diff --git a/src/Android/ci-build-apks.ps1 b/src/Android/ci-build-apks.ps1 index bfd871d57..c1bcfed4b 100644 --- a/src/Android/ci-build-apks.ps1 +++ b/src/Android/ci-build-apks.ps1 @@ -32,7 +32,7 @@ $signedApkPath = $($rootPath + "\src\Android\bin\Release\com.x8bit.bitwarden-Sig $signedApkDestPath = $($rootPath + "\com.x8bit.bitwarden-" + $env:APPVEYOR_BUILD_NUMBER + ".apk"); Copy-Item $signedApkPath $signedApkDestPath -<# + echo "##### Clean Android and App" msbuild "$($androidPath)" "/t:Clean" "/p:Configuration=FDroid" @@ -83,5 +83,5 @@ $signedApkPath = $($rootPath + "\src\Android\bin\FDroid\com.x8bit.bitwarden-Sign $signedApkDestPath = $($rootPath + "\com.x8bit.bitwarden-fdroid-" + $env:APPVEYOR_BUILD_NUMBER + ".apk"); Copy-Item $signedApkPath $signedApkDestPath -#> + echo "##### Done"