Skip to content

Commit 1ad734f

Browse files
riggarooriggaroo
authored
Remove building release on PRs (#1380)
When building from a fork pull request, the secrets are not shared. This PR removes the need to build a release since it wasn't used, named the signing config it to be a release.
2 parents cf40662 + b704c2d commit 1ad734f

10 files changed

Lines changed: 22 additions & 25 deletions

File tree

‎.github/workflows/Crane.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
target: google_apis
7777
arch: x86
7878
disable-animations: true
79-
script: ./gradlew connectedCheck --stacktrace
79+
script: ./gradlew app:connectedDebugAndroidTest --stacktrace
8080
working-directory: ${{ env.SAMPLE_PATH }}
8181

8282
- name: Upload test reports

‎.github/workflows/build-sample.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ jobs:
6969
working-directory: ${{ inputs.path }}
7070
run: ./gradlew assembleDebug --stacktrace
7171

72-
- name: Build release
73-
working-directory: ${{ inputs.path }}
74-
run: ./gradlew assembleRelease --stacktrace
75-
7672
- name: Run local tests
7773
working-directory: ${{ inputs.path }}
7874
run: ./gradlew testDebug --stacktrace

‎Crane/app/build.gradle.kts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ android {
4848
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
4949
val localKeystore = rootProject.file("debug_2.keystore")
5050
val hasKeyInfo = userKeystore.exists()
51-
named("debug") {
51+
create("release") {
5252
storeFile = if (hasKeyInfo) userKeystore else localKeystore
5353
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
5454
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
@@ -58,18 +58,19 @@ android {
5858

5959
buildTypes {
6060
getByName("debug") {
61+
6162
}
6263

6364
getByName("release") {
6465
isMinifyEnabled = true
65-
signingConfig = signingConfigs.getByName("debug")
66+
signingConfig = signingConfigs.getByName("release")
6667
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
6768
"proguard-rules.pro")
6869
}
6970

7071
create("benchmark") {
7172
initWith(getByName("release"))
72-
signingConfig = signingConfigs.getByName("debug")
73+
signingConfig = signingConfigs.getByName("release")
7374
matchingFallbacks.add("release")
7475
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
7576
"proguard-benchmark-rules.pro")

‎JetLagged/app/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
3939
val localKeystore = rootProject.file("debug_2.keystore")
4040
val hasKeyInfo = userKeystore.exists()
41-
named("debug") {
41+
create("release") {
4242
storeFile = if (hasKeyInfo) userKeystore else localKeystore
4343
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
4444
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
@@ -53,14 +53,14 @@ android {
5353

5454
getByName("release") {
5555
isMinifyEnabled = true
56-
signingConfig = signingConfigs.getByName("debug")
56+
signingConfig = signingConfigs.getByName("release")
5757
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
5858
"proguard-rules.pro")
5959
}
6060

6161
create("benchmark") {
6262
initWith(getByName("release"))
63-
signingConfig = signingConfigs.getByName("debug")
63+
signingConfig = signingConfigs.getByName("release")
6464
matchingFallbacks.add("release")
6565
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
6666
"proguard-benchmark-rules.pro")

‎JetNews/app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
3939
val localKeystore = rootProject.file("debug_2.keystore")
4040
val hasKeyInfo = userKeystore.exists()
41-
named("debug") {
41+
create("release") {
4242
storeFile = if (hasKeyInfo) userKeystore else localKeystore
4343
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
4444
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
@@ -53,7 +53,7 @@ android {
5353

5454
getByName("release") {
5555
isMinifyEnabled = true
56-
signingConfig = signingConfigs.getByName("debug")
56+
signingConfig = signingConfigs.getByName("release")
5757
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
5858
"proguard-rules.pro")
5959
}

‎Jetcaster/mobile/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ android {
4040
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
4141
val localKeystore = rootProject.file("debug_2.keystore")
4242
val hasKeyInfo = userKeystore.exists()
43-
named("debug") {
43+
create("release") {
4444
// get from env variables
4545
storeFile = if (hasKeyInfo) userKeystore else localKeystore
4646
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
@@ -56,7 +56,7 @@ android {
5656

5757
getByName("release") {
5858
isMinifyEnabled = true
59-
signingConfig = signingConfigs.getByName("debug")
59+
signingConfig = signingConfigs.getByName("release")
6060
proguardFiles(
6161
getDefaultProguardFile("proguard-android-optimize.txt"),
6262
"proguard-rules.pro"

‎Jetchat/app/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ android {
3939
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
4040
val localKeystore = rootProject.file("debug_2.keystore")
4141
val hasKeyInfo = userKeystore.exists()
42-
named("debug") {
42+
create("release") {
4343
storeFile = if (hasKeyInfo) userKeystore else localKeystore
4444
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
4545
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
@@ -49,12 +49,12 @@ android {
4949

5050
buildTypes {
5151
getByName("debug") {
52-
52+
5353
}
5454

5555
getByName("release") {
5656
isMinifyEnabled = true
57-
signingConfig = signingConfigs.getByName("debug")
57+
signingConfig = signingConfigs.getByName("release")
5858
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
5959
"proguard-rules.pro")
6060
}

‎Jetsnack/app/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
3939
val localKeystore = rootProject.file("debug_2.keystore")
4040
val hasKeyInfo = userKeystore.exists()
41-
named("debug") {
41+
create("release") {
4242
storeFile = if (hasKeyInfo) userKeystore else localKeystore
4343
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
4444
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
@@ -53,14 +53,14 @@ android {
5353

5454
getByName("release") {
5555
isMinifyEnabled = true
56-
signingConfig = signingConfigs.getByName("debug")
56+
signingConfig = signingConfigs.getByName("release")
5757
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
5858
"proguard-rules.pro")
5959
}
6060

6161
create("benchmark") {
6262
initWith(getByName("release"))
63-
// signingConfig = signingConfigs.getByName("debug")
63+
signingConfig = signingConfigs.getByName("release")
6464
matchingFallbacks.add("release")
6565
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
6666
"proguard-benchmark-rules.pro")

‎Owl/app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
3939
val localKeystore = rootProject.file("debug_2.keystore")
4040
val hasKeyInfo = userKeystore.exists()
41-
named("debug") {
41+
create("release") {
4242
storeFile = if (hasKeyInfo) userKeystore else localKeystore
4343
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
4444
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
@@ -53,7 +53,7 @@ android {
5353

5454
getByName("release") {
5555
isMinifyEnabled = true
56-
signingConfig = signingConfigs.getByName("debug")
56+
signingConfig = signingConfigs.getByName("release")
5757
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
5858
"proguard-rules.pro")
5959
}

‎Reply/app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
3939
val localKeystore = rootProject.file("debug_2.keystore")
4040
val hasKeyInfo = userKeystore.exists()
41-
named("debug") {
41+
create("release") {
4242
// get from env variables
4343
storeFile = if (hasKeyInfo) userKeystore else localKeystore
4444
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
@@ -54,7 +54,7 @@ android {
5454

5555
getByName("release") {
5656
isMinifyEnabled = true
57-
signingConfig = signingConfigs.getByName("debug")
57+
signingConfig = signingConfigs.getByName("release")
5858
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
5959
"proguard-rules.pro")
6060
}

0 commit comments

Comments
 (0)