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.

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

Fix release workflow #502

Merged
merged 16 commits into from
Oct 7, 2023
Merged
10 changes: 4 additions & 6 deletions .github/workflows/build_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@ name: Build Debug APK
on:
push:
branches:
- '*'
- 'main'
paths-ignore:
- '**.md'
- '**.yml'
pull_request:
branches:
- '*'
pull_request_review:
paths-ignore:
- '**.md'
types: [opened, reopened]
types: submitted
workflow_dispatch:


Expand Down Expand Up @@ -50,7 +48,7 @@ jobs:
with:
releaseDir: app/build/outputs/apk/debug
signingKeyBase64: ${{ secrets.KEY_BASE64 }}
alias: ${{ secrets.ALIAS }}
alias: ${{ secrets.KEY_ALIAS }}
keyStorePassword: ${{ secrets.KEYSTORE_PASS }}
keyPassword: ${{ secrets.KEYSTORE_PASS }}
- name: Remove file that aren't signed
Expand Down
19 changes: 13 additions & 6 deletions .github/workflows/release_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ jobs:
uses: actions/[email protected]
with:
submodules: true


- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1

- name: Set up Java 17
uses: actions/[email protected]
with:
Expand All @@ -33,22 +36,26 @@ jobs:

- name: Grant execution permission to Gradle Wrapper
run: chmod +x gradlew

- name: Build Release APK
run: ./gradlew assembleRelease
uses: gradle/[email protected]
with:
arguments: assembleRelease

- name: Checks
run: cd app/build && ls -R
run: find . -type f -name "*.apk"

- uses: r0adkll/sign-android-release@v1
name: Sign app APK
id: sign_app
with:
releaseDirectory: app/release
releaseDirectory: app/build/outputs/apk/release
signingKeyBase64: ${{ secrets.KEY_BASE64 }}
alias: ${{ secrets.ALIAS }}
alias: ${{ secrets.KEY_ALIAS }}
keyStorePassword: ${{ secrets.KEYSTORE_PASS }}
keyPassword: ${{ secrets.KEYSTORE_PASS }}
env:
BUILD_TOOLS_VERSION: "34.0.0"

- uses: actions/[email protected]
with:
Expand Down
1 change: 0 additions & 1 deletion app/proguard.pro
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Disable ServiceLoader reproducibility-breaking optimizations
-keep class kotlinx.coroutines.CoroutineExceptionHandler
-keep class kotlinx.coroutines.internal.MainDispatcherFactory
-keep class com.looker.core.common.R$drawable

-dontwarn kotlinx.serialization.KSerializer
-dontwarn kotlinx.serialization.Serializable
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/raw/keep.xml

This file was deleted.

1 change: 1 addition & 0 deletions build-logic/structure/src/main/kotlin/DefaultConfig.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
object DefaultConfig {
// Update [release_build.yml] along with this
const val buildTools: String = "34.0.0"
const val appId = "com.looker.droidify"
const val compileSdk = 34
Expand Down
3 changes: 0 additions & 3 deletions core/common/src/main/res/raw/keep.xml

This file was deleted.

3 changes: 2 additions & 1 deletion core/data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ android {

buildTypes {
release {
isMinifyEnabled = true
// TODO: Enable once using
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
}
create("alpha") {
Expand Down
5 changes: 3 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ org.gradle.daemon=true
org.gradle.jvmargs=-Xmx6g -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g
android.useAndroidX=true
org.gradle.parallel=true
android.nonFinalResIds=true
android.enableJetifier=false
android.enableR8.fullMode=true
android.nonTransitiveRClass=true
android.defaults.buildfeatures.buildconfig=false
android.nonFinalResIds=true
org.gradle.unsafe.configuration-cache=true
android.defaults.buildfeatures.buildconfig=false
Loading