sign fdroid builds with a different keystore (#949)
This commit is contained in:
parent
0fcf006484
commit
7e633d31a0
|
@ -150,6 +150,7 @@
|
||||||
<None Include="ci-build-apks.ps1" />
|
<None Include="ci-build-apks.ps1" />
|
||||||
<GoogleServicesJson Include="google-services.json" />
|
<GoogleServicesJson Include="google-services.json" />
|
||||||
<GoogleServicesJson Include="google-services.json.enc" />
|
<GoogleServicesJson Include="google-services.json.enc" />
|
||||||
|
<None Include="fdroid-keystore.jks.enc" />
|
||||||
<None Include="Properties\AndroidManifest.xml" />
|
<None Include="Properties\AndroidManifest.xml" />
|
||||||
<None Include="upload-keystore.jks.enc" />
|
<None Include="upload-keystore.jks.enc" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
|
@ -22,10 +22,12 @@ echo "##### Decrypt Keystore"
|
||||||
echo "########################################"
|
echo "########################################"
|
||||||
|
|
||||||
$encKeystorePath = $($rootPath + "\src\Android\8bit.keystore.enc");
|
$encKeystorePath = $($rootPath + "\src\Android\8bit.keystore.enc");
|
||||||
|
$encFdroidKeystorePath = $($rootPath + "\src\Android\fdroid-keystore.jks.enc");
|
||||||
$encUploadKeystorePath = $($rootPath + "\src\Android\upload-keystore.jks.enc");
|
$encUploadKeystorePath = $($rootPath + "\src\Android\upload-keystore.jks.enc");
|
||||||
$secureFilePath = $($rootPath + "\secure-file\tools\secure-file.exe");
|
$secureFilePath = $($rootPath + "\secure-file\tools\secure-file.exe");
|
||||||
|
|
||||||
Invoke-Expression "& `"$secureFilePath`" -decrypt $($encKeystorePath) -secret $($env:keystore_dec_secret)"
|
Invoke-Expression "& `"$secureFilePath`" -decrypt $($encKeystorePath) -secret $($env:keystore_dec_secret)"
|
||||||
|
Invoke-Expression "& `"$secureFilePath`" -decrypt $($encFdroidKeystorePath) -secret $($env:fdroid_apk_keystore_dec_secret)"
|
||||||
Invoke-Expression "& `"$secureFilePath`" -decrypt $($encUploadKeystorePath) -secret $($env:upload_keystore_dec_secret)"
|
Invoke-Expression "& `"$secureFilePath`" -decrypt $($encUploadKeystorePath) -secret $($env:upload_keystore_dec_secret)"
|
||||||
|
|
||||||
echo "########################################"
|
echo "########################################"
|
||||||
|
@ -146,9 +148,10 @@ echo "########################################"
|
||||||
msbuild "$($androidPath)" "/logger:C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" `
|
msbuild "$($androidPath)" "/logger:C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" `
|
||||||
"/p:Configuration=FDroid"
|
"/p:Configuration=FDroid"
|
||||||
msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=FDroid" "/p:AndroidKeyStore=true" `
|
msbuild "$($androidPath)" "/t:SignAndroidPackage" "/p:Configuration=FDroid" "/p:AndroidKeyStore=true" `
|
||||||
"/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:keystore_password)" `
|
"/p:AndroidSigningKeyAlias=bitwarden" "/p:AndroidSigningKeyPass=$($env:fdroid_apk_keystore_password)" `
|
||||||
"/p:AndroidSigningKeyStore=8bit.keystore" "/p:AndroidSigningStorePass=$($env:keystore_password)" "/v:quiet"
|
"/p:AndroidSigningKeyStore=fdroid-keystore.jks" "/p:AndroidSigningStorePass=$($env:fdroid_apk_keystore_password)" `
|
||||||
|
"/v:quiet"
|
||||||
|
|
||||||
echo "########################################"
|
echo "########################################"
|
||||||
echo "##### Copy FDroid apk to project root"
|
echo "##### Copy FDroid apk to project root"
|
||||||
echo "########################################"
|
echo "########################################"
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue