Skip to content

Commit 9eba888

Browse files
committed
build: re-enable developers use file(s) to store sign key properties
1 parent 63682d4 commit 9eba888

File tree

3 files changed

+33
-15
lines changed

3 files changed

+33
-15
lines changed

.github/workflows/nightly-ci.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ jobs:
1414
build:
1515
if: ${{ github.repository == 'osfans/trime' && github.ref == 'refs/heads/develop' }}
1616
runs-on: ubuntu-24.04
17-
env:
18-
SIGN_KEY_BASE64: ${{ secrets.SIGNING_KEY }}
19-
SIGN_KEY_STORE_PWD: ${{ secrets.KEY_STORE_PASSWORD }}
20-
SIGN_KEY_ALIAS: ${{ secrets.ALIAS }}
21-
SIGN_KEY_PWD: ${{ secrets.KEY_PASSWORD }}
2217
steps:
2318
- name: Checkout
2419
uses: actions/checkout@v4
@@ -49,6 +44,15 @@ jobs:
4944
- name: Setup Android SDK
5045
uses: android-actions/setup-android@v3
5146

47+
- name: Setup Keystore
48+
run: |
49+
cat << EOF > keystore.properties
50+
keyBase64=${{ secrets.SIGNING_KEY }}
51+
storePassword=${{ secrets.KEY_STORE_PASSWORD }}
52+
keyAlias=${{ secrets.ALIAS }}
53+
keyPassword=${{ secrets.KEY_PASSWORD }}
54+
EOF
55+
5256
- name: Build Trime
5357
run: make release
5458

.github/workflows/release-ci.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ env:
1313
jobs:
1414
build:
1515
runs-on: ubuntu-24.04
16-
env:
17-
SIGN_KEY_BASE64: ${{ secrets.SIGNING_KEY }}
18-
SIGN_KEY_STORE_PWD: ${{ secrets.KEY_STORE_PASSWORD }}
19-
SIGN_KEY_ALIAS: ${{ secrets.ALIAS }}
20-
SIGN_KEY_PWD: ${{ secrets.KEY_PASSWORD }}
2116
steps:
2217
- name: Checkout
2318
uses: actions/checkout@v4
@@ -48,6 +43,15 @@ jobs:
4843
- name: Setup Android SDK
4944
uses: android-actions/setup-android@v3
5045

46+
- name: Setup Keystore
47+
run: |
48+
cat << EOF > keystore.properties
49+
keyBase64=${{ secrets.SIGNING_KEY }}
50+
storePassword=${{ secrets.KEY_STORE_PASSWORD }}
51+
keyAlias=${{ secrets.ALIAS }}
52+
keyPassword=${{ secrets.KEY_PASSWORD }}
53+
EOF
54+
5155
- name: Build Trime
5256
run: make release
5357

build-logic/convention/src/main/kotlin/ProjectExtensions.kt

+15-5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import org.gradle.api.Project
77
import org.gradle.api.Task
88
import java.io.ByteArrayOutputStream
99
import java.io.File
10+
import java.util.Properties
1011
import kotlin.io.encoding.Base64
1112
import kotlin.io.encoding.ExperimentalEncodingApi
1213

@@ -80,20 +81,29 @@ val Project.buildTimestamp
8081
System.currentTimeMillis().toString()
8182
}
8283

84+
val Project.signKeyStoreProps: Properties?
85+
get() {
86+
val name =
87+
envOrPropOrNull("KEYSTORE_PROPERTIES", "keystoreProperties")
88+
?: "keystore.properties"
89+
val file = File(name)
90+
return if (file.exists()) Properties().apply { load(file.inputStream()) } else null
91+
}
92+
8393
val Project.signKeyBase64: String?
84-
get() = envOrPropOrNull("SIGN_KEY_BASE64", "signKeyBase64")
94+
get() = signKeyStoreProps?.get("keyBase64") as? String
8595

8696
val Project.signKeyStore
87-
get() = envOrPropOrNull("SIGN_KEY_STORE", "signKeyStore")
97+
get() = signKeyStoreProps?.get("storeFile") as? String
8898

8999
val Project.signKeyStorePwd
90-
get() = envOrPropOrNull("SIGN_KEY_STORE_PWD", "signKeyStorePwd")
100+
get() = signKeyStoreProps?.get("storePassword") as? String
91101

92102
val Project.signKeyAlias
93-
get() = envOrPropOrNull("SIGN_KEY_ALIAS", "signKeyAlias")
103+
get() = signKeyStoreProps?.get("keyAlias") as? String
94104

95105
val Project.signKeyPwd
96-
get() = envOrPropOrNull("SIGN_KEY_PWD", "signKeyPwd")
106+
get() = signKeyStoreProps?.get("keyPassword") as? String
97107

98108
val Project.signKeyFile: File?
99109
get() {

0 commit comments

Comments
 (0)