Skip to content

Commit 915d7e4

Browse files
author
Jaydatt Khodave
committed
ci: avoid unsigned release builds
1 parent 20a060c commit 915d7e4

4 files changed

Lines changed: 26 additions & 10 deletions

File tree

.github/workflows/android-auto-release.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ concurrency:
1414
group: android-auto-release
1515
cancel-in-progress: false
1616

17+
env:
18+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
19+
1720
jobs:
1821
auto-release:
1922
name: Build signed AAB and create release
@@ -122,6 +125,10 @@ jobs:
122125
KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
123126
KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
124127
KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
128+
ORG_GRADLE_PROJECT_KEYSTORE_FILE: ${{ github.workspace }}/release-keystore.jks
129+
ORG_GRADLE_PROJECT_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
130+
ORG_GRADLE_PROJECT_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
131+
ORG_GRADLE_PROJECT_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
125132
run: |
126133
./gradlew --no-daemon clean bundleRelease assembleRelease
127134

.github/workflows/android-release.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
permissions:
77
contents: write
88

9+
env:
10+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
11+
912
jobs:
1013
build-release-aab:
1114
name: Build signed release AAB
@@ -80,6 +83,10 @@ jobs:
8083
8184
- name: Build signed release AAB
8285
env:
86+
ORG_GRADLE_PROJECT_KEYSTORE_FILE: ${{ env.KEYSTORE_FILE }}
87+
ORG_GRADLE_PROJECT_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
88+
ORG_GRADLE_PROJECT_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
89+
ORG_GRADLE_PROJECT_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
8390
KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
8491
KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
8592
KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}

.github/workflows/android.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
pull_request:
66
workflow_dispatch:
77

8+
env:
9+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
10+
811
jobs:
912
build:
1013
runs-on: ubuntu-latest
@@ -29,16 +32,11 @@ jobs:
2932
uses: gradle/actions/setup-gradle@v4.4.1
3033

3134
- name: Build with gradle
32-
run: ./gradlew clean assemble
35+
run: ./gradlew clean :app:assembleDebug
3336

3437
- name: Upload debug apks
3538
uses: actions/upload-artifact@v4.6.2
3639
with:
3740
name: app-debug
3841
path: app/build/outputs/apk/debug
3942

40-
- name: Upload release apks
41-
uses: actions/upload-artifact@v4.6.2
42-
with:
43-
name: app-release
44-
path: app/build/outputs/apk/release

app/build.gradle.kts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ plugins {
55
alias(libs.plugins.kotlin.compose)
66
}
77

8+
fun signingValue(name: String): String? {
9+
return providers.gradleProperty(name).orNull ?: System.getenv(name)
10+
}
11+
812
android {
913
namespace = "com.itisuniqueofficial.lockify"
1014
compileSdk = 36
@@ -21,13 +25,13 @@ android {
2125

2226
signingConfigs {
2327
create("release") {
24-
val keystorePath = System.getenv("KEYSTORE_FILE")
28+
val keystorePath = signingValue("KEYSTORE_FILE")
2529
if (!keystorePath.isNullOrBlank()) {
2630
storeFile = file(keystorePath)
2731
}
28-
storePassword = System.getenv("KEYSTORE_PASSWORD")
29-
keyAlias = System.getenv("KEY_ALIAS")
30-
keyPassword = System.getenv("KEY_PASSWORD")
32+
storePassword = signingValue("KEYSTORE_PASSWORD")
33+
keyAlias = signingValue("KEY_ALIAS")
34+
keyPassword = signingValue("KEY_PASSWORD")
3135
}
3236
}
3337

0 commit comments

Comments
 (0)