Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove building release on PRs #1380

Merged
merged 7 commits into from
May 1, 2024
+22 −25
Merged

Remove building release on PRs #1380

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fd706a4
Remove building release and set signingConfig to null
riggaroo Apr 30, 2024
505bb43
change from named -> create
riggaroo Apr 30, 2024
e2a293f
Fix for Crane
riggaroo Apr 30, 2024
0bd2bff
Change to release
riggaroo Apr 30, 2024
bf5ce41
Remove setting signingConfig to null
riggaroo Apr 30, 2024
9fbcfd1
Change crane to not run benchmarks.
riggaroo Apr 30, 2024
b704c2d
Change crane to not run benchmark
riggaroo Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/Crane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
target: google_apis
arch: x86
disable-animations: true
script: ./gradlew connectedCheck --stacktrace
script: ./gradlew connectedAndroidDebugTest --stacktrace
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this change causes Crane builds to fail https://github.com/android/compose-samples/actions/runs/8898242654/job/24435886140?pr=1380

working-directory: ${{ env.SAMPLE_PATH }}

- name: Upload test reports
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/build-sample.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ jobs:
working-directory: ${{ inputs.path }}
run: ./gradlew assembleDebug --stacktrace

- name: Build release
working-directory: ${{ inputs.path }}
run: ./gradlew assembleRelease --stacktrace

- name: Run local tests
working-directory: ${{ inputs.path }}
run: ./gradlew testDebug --stacktrace
Expand Down
7 changes: 4 additions & 3 deletions Crane/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ android {
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
val localKeystore = rootProject.file("debug_2.keystore")
val hasKeyInfo = userKeystore.exists()
named("debug") {
create("release") {
storeFile = if (hasKeyInfo) userKeystore else localKeystore
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
Expand All @@ -58,18 +58,19 @@ android {

buildTypes {
getByName("debug") {

}

getByName("release") {
isMinifyEnabled = true
signingConfig = signingConfigs.getByName("debug")
signingConfig = signingConfigs.getByName("release")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro")
}

create("benchmark") {
initWith(getByName("release"))
signingConfig = signingConfigs.getByName("debug")
signingConfig = signingConfigs.getByName("release")
matchingFallbacks.add("release")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-benchmark-rules.pro")
Expand Down
6 changes: 3 additions & 3 deletions JetLagged/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android {
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
val localKeystore = rootProject.file("debug_2.keystore")
val hasKeyInfo = userKeystore.exists()
named("debug") {
create("release") {
storeFile = if (hasKeyInfo) userKeystore else localKeystore
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
Expand All @@ -53,14 +53,14 @@ android {

getByName("release") {
isMinifyEnabled = true
signingConfig = signingConfigs.getByName("debug")
signingConfig = signingConfigs.getByName("release")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro")
}

create("benchmark") {
initWith(getByName("release"))
signingConfig = signingConfigs.getByName("debug")
signingConfig = signingConfigs.getByName("release")
matchingFallbacks.add("release")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-benchmark-rules.pro")
Expand Down
4 changes: 2 additions & 2 deletions JetNews/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android {
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
val localKeystore = rootProject.file("debug_2.keystore")
val hasKeyInfo = userKeystore.exists()
named("debug") {
create("release") {
storeFile = if (hasKeyInfo) userKeystore else localKeystore
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
Expand All @@ -53,7 +53,7 @@ android {

getByName("release") {
isMinifyEnabled = true
signingConfig = signingConfigs.getByName("debug")
signingConfig = signingConfigs.getByName("release")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro")
}
Expand Down
4 changes: 2 additions & 2 deletions Jetcaster/mobile/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ android {
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
val localKeystore = rootProject.file("debug_2.keystore")
val hasKeyInfo = userKeystore.exists()
named("debug") {
create("release") {
// get from env variables
storeFile = if (hasKeyInfo) userKeystore else localKeystore
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
Expand All @@ -56,7 +56,7 @@ android {

getByName("release") {
isMinifyEnabled = true
signingConfig = signingConfigs.getByName("debug")
signingConfig = signingConfigs.getByName("release")
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
Expand Down
6 changes: 3 additions & 3 deletions Jetchat/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ android {
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
val localKeystore = rootProject.file("debug_2.keystore")
val hasKeyInfo = userKeystore.exists()
named("debug") {
create("release") {
storeFile = if (hasKeyInfo) userKeystore else localKeystore
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
Expand All @@ -49,12 +49,12 @@ android {

buildTypes {
getByName("debug") {

}

getByName("release") {
isMinifyEnabled = true
signingConfig = signingConfigs.getByName("debug")
signingConfig = signingConfigs.getByName("release")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro")
}
Expand Down
6 changes: 3 additions & 3 deletions Jetsnack/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android {
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
val localKeystore = rootProject.file("debug_2.keystore")
val hasKeyInfo = userKeystore.exists()
named("debug") {
create("release") {
storeFile = if (hasKeyInfo) userKeystore else localKeystore
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
Expand All @@ -53,14 +53,14 @@ android {

getByName("release") {
isMinifyEnabled = true
signingConfig = signingConfigs.getByName("debug")
signingConfig = signingConfigs.getByName("release")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro")
}

create("benchmark") {
initWith(getByName("release"))
// signingConfig = signingConfigs.getByName("debug")
signingConfig = signingConfigs.getByName("release")
matchingFallbacks.add("release")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-benchmark-rules.pro")
Expand Down
4 changes: 2 additions & 2 deletions Owl/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android {
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
val localKeystore = rootProject.file("debug_2.keystore")
val hasKeyInfo = userKeystore.exists()
named("debug") {
create("release") {
storeFile = if (hasKeyInfo) userKeystore else localKeystore
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
keyAlias = if (hasKeyInfo) "androiddebugkey" else System.getenv("compose_key_alias")
Expand All @@ -53,7 +53,7 @@ android {

getByName("release") {
isMinifyEnabled = true
signingConfig = signingConfigs.getByName("debug")
signingConfig = signingConfigs.getByName("release")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro")
}
Expand Down
4 changes: 2 additions & 2 deletions Reply/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android {
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
val localKeystore = rootProject.file("debug_2.keystore")
val hasKeyInfo = userKeystore.exists()
named("debug") {
create("release") {
// get from env variables
storeFile = if (hasKeyInfo) userKeystore else localKeystore
storePassword = if (hasKeyInfo) "android" else System.getenv("compose_store_password")
Expand All @@ -54,7 +54,7 @@ android {

getByName("release") {
isMinifyEnabled = true
signingConfig = signingConfigs.getByName("debug")
signingConfig = signingConfigs.getByName("release")
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro")
}
Expand Down
Loading