Real fix pr check

This commit is contained in:
Nullptr 2022-08-24 18:47:00 +08:00
commit 0b0af2f0c5
No known key found for this signature in database
5 changed files with 12 additions and 15 deletions

View file

@ -25,15 +25,9 @@ jobs:
with:
java-version: '11'
- name: Creat key
- name: Write properties
run: |
PASSWD=$(echo $RANDOM | md5sum | head -c 15)
keytool -genkey -noprompt -v -keystore android.keystore -alias PRCHECKSIGN -keyalg RSA -keysize 2048 -validity 10000 -keypass ${PASSWD} -storepass ${PASSWD} -dname "CN=xx, OU=xx, O=xx, L=xx, S=xx, C=xx"
echo buildWithGitSuffix=true >> local.properties
echo storePassword="${PASSWD}" >> local.properties
echo keyAlias="PRCHECKSIGN" >> local.properties
echo keyPassword="${PASSWD}" >> local.properties
echo fileDir='../android.keystore' >> local.properties
- name: Make gradlew executable
run: chmod +x ./gradlew

View file

@ -35,7 +35,7 @@ jobs:
echo storePassword='${{ secrets.KEY_STORE_PASSWORD }}' >> local.properties
echo keyAlias='${{ secrets.ALIAS }}' >> local.properties
echo keyPassword='${{ secrets.ALIAS_KEY_PASSWORD }}' >> local.properties
echo fileDir='key.jks' >> local.properties
echo fileDir=`pwd`/key.jks >> local.properties
echo "${{ secrets.KEY_STORE }}" | base64 --decode > key.jks
echo "${{ secrets.GOOGLE_SERVICES_JSON }}" | base64 --decode > app/google-services.json

View file

@ -184,7 +184,7 @@ class HomeFragment : Fragment(R.layout.fragment_home) {
withContext(Dispatchers.Main) {
PrefManager.lastVersion = BuildConfig.VERSION_CODE
MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.home_new_update)
.setTitle(String.format(getString(R.string.home_update), updateInfo.versionName))
.setMessage(Html.fromHtml(updateInfo.content, Html.FROM_HTML_MODE_COMPACT))
.setPositiveButton(android.R.string.ok, null)
.setCancelable(false)

View file

@ -50,6 +50,7 @@
<string name="home_export_failed">Export failed</string>
<string name="home_exported">Backed up config</string>
<string name="home_new_update">New update available: %s</string>
<string name="home_update">Update: %s</string>
<!-- App select -->
<string name="list_show_system">Show system</string>

View file

@ -68,16 +68,18 @@ fun Project.configureBaseExtension() {
consumerProguardFiles("proguard-rules.pro")
}
val signingCfg = signingConfigs.create("config") {
storeFile = rootProject.file(localProperties.getProperty("fileDir"))
storePassword = localProperties.getProperty("storePassword")
keyAlias = localProperties.getProperty("keyAlias")
keyPassword = localProperties.getProperty("keyPassword")
val config = localProperties.getProperty("fileDir")?.let {
signingConfigs.create("config") {
storeFile = file(it)
storePassword = localProperties.getProperty("storePassword")
keyAlias = localProperties.getProperty("keyAlias")
keyPassword = localProperties.getProperty("keyPassword")
}
}
buildTypes {
all {
signingConfig = signingCfg
signingConfig = config ?: signingConfigs["debug"]
}
named("release") {
isMinifyEnabled = true