ci: fix unable to read secrets

grant exec permission to gradlew
This commit is contained in:
BinTianqi
2024-05-25 18:47:45 +08:00
parent acf3cb6b81
commit 67d00af016
3 changed files with 10 additions and 16 deletions

View File

@@ -23,9 +23,6 @@ jobs:
- name: Get short commit SHA - name: Get short commit SHA
run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
- name: Grant execution permission to Gradle Wrapper
run: chmod +x gradlew
- name: Build APK (testkey) - name: Build APK (testkey)
run: ./gradlew build run: ./gradlew build
@@ -43,14 +40,14 @@ jobs:
- name: Export key - name: Export key
env: env:
KEY_BASE64: ${{ secret.KEY_BASE64 }} KEY_BASE64: ${{ secrets.KEY_BASE64 }}
run: echo $KEY_BASE64 | base64 --decode - > app/signature.jks run: echo $KEY_BASE64 | base64 --decode - > app/signature.jks
- name: Build APK - name: Build APK
env: env:
KEYSTORE_PASSWORD: ${{ secret.KEYSTORE_PASSWORD }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_PASSWORD: ${{ secret.KEY_PASSWORD }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
KEY_ALIAS: ${{ secret.KEY_ALIAS }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
run: ./gradlew build run: ./gradlew build
- name: Upload Debug APK - name: Upload Debug APK

View File

@@ -9,11 +9,11 @@ var keyAlias: String? = null
android { android {
signingConfigs { signingConfigs {
create("testkey") { create("defaultSignature") {
storeFile = file("signature.jks") storeFile = file("signature.jks")
storePassword = keystorePassword ?: "testkey" storePassword = System.getenv("KEYSTORE_PASSWORD") ?: "testkey"
keyPassword = keyPassword ?: "testkey" keyPassword = System.getenv("KEY_PASSWORD") ?: "testkey"
keyAlias = keyAlias ?: "testkey" keyAlias = System.getenv("KEY_ALIAS") ?: "testkey"
} }
} }
namespace = "com.bintianqi.owndroid" namespace = "com.bintianqi.owndroid"
@@ -39,10 +39,10 @@ android {
getDefaultProguardFile("proguard-android-optimize.txt"), getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro" "proguard-rules.pro"
) )
signingConfig = signingConfigs.getByName("testkey") signingConfig = signingConfigs.getByName("defaultSignature")
} }
debug { debug {
signingConfig = signingConfigs.getByName("testkey") signingConfig = signingConfigs.getByName("defaultSignature")
} }
} }
compileOptions { compileOptions {
@@ -86,9 +86,6 @@ tasks.register("prepareSignature") {
file("signature.jks").let { file("signature.jks").let {
if(!it.exists()) file("testkey.jks").copyTo(it) if(!it.exists()) file("testkey.jks").copyTo(it)
} }
keystorePassword = System.getenv("KEYSTORE_PASSWORD")
keyAlias = System.getenv("KEY_ALIAS")
keyPassword = System.getenv("KEY_PASSWORD")
} }
} }

0
gradlew vendored Normal file → Executable file
View File