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

Jump to bottom

Switch to using local debug.keystore in all samples. #1362

Merged
merged 15 commits into from Apr 29, 2024
Merged

Switch to using local debug.keystore in all samples. #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3f8be4e
Switch to using local debug keystore instead of packaged one.
riggaroo Apr 25, 2024
82feefd
Switch other samples to use local debug keystore
riggaroo Apr 25, 2024
b31aaff
Merge branch 'refs/heads/main' into bugfix/fix-debug-keystores
riggaroo Apr 26, 2024
7fc6f96
Upload new keystore with secret password, default to user.home debug.…
riggaroo Apr 26, 2024
51b0831
Remove debug signing config
riggaroo Apr 26, 2024
1683211
Move env variables to all steps.
riggaroo Apr 26, 2024
10301e2
Merge branch 'main' into bugfix/fix-debug-keystores
riggaroo Apr 26, 2024
33796df
Changed to uppercase for secret retrieval
riggaroo Apr 27, 2024
727a2e5
Add as input for each yaml file.
riggaroo Apr 27, 2024
092268e
Add secrets heading
riggaroo Apr 27, 2024
cd9aab9
add inputs to workflow
riggaroo Apr 27, 2024
ae58d32
add as env variable
riggaroo Apr 27, 2024
0c468f4
Remove duplicate $
riggaroo Apr 27, 2024
66e8f0d
add to test env
riggaroo Apr 27, 2024
b22b5a9
switch to ubuntu for reply
riggaroo Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/Crane.yaml
View file
Open in desktop
Expand Up @@ -15,13 +15,19 @@ on:

env:
SAMPLE_PATH: Crane

compose_store_password: ${{ secrets.compose_store_password }}
compose_key_alias: ${{ secrets.compose_key_alias }}
compose_key_password: ${{ secrets.compose_key_password }}
jobs:
build:
uses: ./.github/workflows/build-sample.yml
with:
name: Crane
path: Crane
secrets:
compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}

test:
needs: build
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/JetLagged.yaml
View file
Open in desktop
Expand Up @@ -15,13 +15,19 @@ on:

env:
SAMPLE_PATH: JetLagged

compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
jobs:
build:
uses: ./.github/workflows/build-sample.yml
with:
name: JetLagged
path: JetLagged
secrets:
compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}

test:
needs: build
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/JetNews.yaml
View file
Open in desktop
Expand Up @@ -15,13 +15,19 @@ on:

env:
SAMPLE_PATH: JetNews

compose_store_password: ${{ secrets.compose_store_password }}
compose_key_alias: ${{ secrets.compose_key_alias }}
compose_key_password: ${{ secrets.compose_key_password }}
jobs:
build:
uses: ./.github/workflows/build-sample.yml
with:
name: JetNews
path: JetNews
secrets:
compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}

androidTest:
needs: build
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/Jetcaster.yaml
View file
Open in desktop
Expand Up @@ -20,3 +20,7 @@ jobs:
name: Jetcaster
path: Jetcaster
module: mobile
secrets:
compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
9 changes: 7 additions & 2 deletions .github/workflows/Jetchat.yaml
View file
Open in desktop
Expand Up @@ -15,14 +15,19 @@ on:

env:
SAMPLE_PATH: Jetchat

compose_store_password: ${{ secrets.compose_store_password }}
compose_key_alias: ${{ secrets.compose_key_alias }}
compose_key_password: ${{ secrets.compose_key_password }}
jobs:
build:
uses: ./.github/workflows/build-sample.yml
with:
name: Jetchat
path: Jetchat

secrets:
compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
test:
needs: build
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/Jetsnack.yaml
View file
Open in desktop
Expand Up @@ -19,3 +19,7 @@ jobs:
with:
name: Jetsnack
path: Jetsnack
secrets:
compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
4 changes: 4 additions & 0 deletions .github/workflows/Jetsurvey.yaml
View file
Open in desktop
Expand Up @@ -19,3 +19,7 @@ jobs:
with:
name: Jetsurvey
path: Jetsurvey
secrets:
compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
8 changes: 7 additions & 1 deletion .github/workflows/Owl.yaml
View file
Open in desktop
Expand Up @@ -15,13 +15,19 @@ on:

env:
SAMPLE_PATH: Owl

compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
jobs:
build:
uses: ./.github/workflows/build-sample.yml
with:
name: Owl
path: Owl
secrets:
compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}

test:
needs: build
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/Release.yml
View file
Open in desktop
Expand Up @@ -4,7 +4,10 @@ on:
push:
tags:
- 'v*'

env:
compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
jobs:
build:
runs-on: ubuntu-latest
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/Reply.yaml
View file
Open in desktop
Expand Up @@ -15,17 +15,23 @@ on:

env:
SAMPLE_PATH: Reply

compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
jobs:
build:
uses: ./.github/workflows/build-sample.yml
with:
name: Reply
path: Reply
secrets:
compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}

test:
needs: build
runs-on: ubuntu-latest
runs-on: ubuntu-latest # enables hardware acceleration in the virtual machine
timeout-minutes: 30
strategy:
matrix:
Expand Down
20 changes: 16 additions & 4 deletions .github/workflows/build-sample.yml
View file
Open in desktop
Expand Up @@ -12,11 +12,23 @@ on:
module:
default: "app"
type: string

secrets:
compose_store_password:
description: 'password for the keystore'
required: true
compose_key_alias:
description: 'alias for the keystore'
required: true
compose_key_password:
description: 'password for the key'
required: true
concurrency:
group: ${{ inputs.name }}-build-${{ github.ref }}
cancel-in-progress: true

env:
compose_store_password: ${{ secrets.compose_store_password }}
compose_key_alias: ${{ secrets.compose_key_alias }}
compose_key_password: ${{ secrets.compose_key_password }}
jobs:
build:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -69,11 +81,11 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: build-outputs
path: ${{ inputs.path }}/${{ inputs.module }}/build/outputs
path: ${{ inputs.path }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v4
with:
name: build-reports
path: ${{ inputs.path }}/${{ inputs.module }}/build/reports
path: ${{ inputs.path }}/app/build/reports
5 changes: 4 additions & 1 deletion .github/workflows/test-snapshot.yml
View file
Open in desktop
Expand Up @@ -9,7 +9,10 @@ on:
composeVersion:
required: true
type: string

env:
compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }}
concurrency:
group: ${{ inputs.name }}-build-${{ github.ref }}
cancel-in-progress: true
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/update_deps.yml
View file
Open in desktop
Expand Up @@ -2,7 +2,10 @@ name: Update Versions / Dependencies

on:
workflow_dispatch:

env:
compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }}
compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }}
compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }}
jobs:
build:
runs-on: ubuntu-latest
Expand Down
13 changes: 7 additions & 6 deletions Crane/app/build.gradle.kts
View file
Open in desktop
Expand Up @@ -45,18 +45,19 @@ android {
}

signingConfigs {
// We use a bundled debug keystore, to allow debug builds from CI to be upgradable
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
val localKeystore = rootProject.file("debug_2.keystore")
val hasKeyInfo = userKeystore.exists()
named("debug") {
storeFile = rootProject.file("debug.keystore")
storePassword = "android"
keyAlias = "androiddebugkey"
keyPassword = "android"
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")
keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
}
}

buildTypes {
getByName("debug") {
signingConfig = signingConfigs.getByName("debug")
}

getByName("release") {
Expand Down
Binary file removed Crane/debug.keystore
View file
Open in desktop
Binary file not shown.
Binary file added Crane/debug_2.keystore
View file
Open in desktop
Binary file not shown.
15 changes: 9 additions & 6 deletions JetLagged/app/build.gradle.kts
View file
Open in desktop
Expand Up @@ -34,18 +34,21 @@ android {
}

signingConfigs {
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we just remove this block altogether? I think Android Studio already defaults to the local key with these parameters for debug builds.

Copy link
Contributor

Choose a reason for hiding this comment

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

Question is if the benchmark buildType allows it, but I assume there's default signingConfig even if it's not defined.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Benchmark requires release build, and release requires a certificate :-/ Not sure how else to work around this

// We use a bundled debug keystore, to allow debug builds from CI to be upgradable
// Important: change the keystore for a production deployment
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
val localKeystore = rootProject.file("debug_2.keystore")
val hasKeyInfo = userKeystore.exists()
named("debug") {
storeFile = rootProject.file("debug.keystore")
storePassword = "android"
keyAlias = "androiddebugkey"
keyPassword = "android"
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")
keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
}
}

buildTypes {
getByName("debug") {
signingConfig = signingConfigs.getByName("debug")

}

getByName("release") {
Expand Down
Binary file removed JetLagged/debug.keystore
View file
Open in desktop
Binary file not shown.
Binary file added JetLagged/debug_2.keystore
View file
Open in desktop
Binary file not shown.
15 changes: 9 additions & 6 deletions JetNews/app/build.gradle.kts
View file
Open in desktop
Expand Up @@ -34,18 +34,21 @@ android {
}

signingConfigs {
// We use a bundled debug keystore, to allow debug builds from CI to be upgradable
// Important: change the keystore for a production deployment
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
val localKeystore = rootProject.file("debug_2.keystore")
val hasKeyInfo = userKeystore.exists()
named("debug") {
storeFile = rootProject.file("debug.keystore")
storePassword = "android"
keyAlias = "androiddebugkey"
keyPassword = "android"
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")
keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
}
}

buildTypes {
getByName("debug") {
signingConfig = signingConfigs.getByName("debug")

}

getByName("release") {
Expand Down
Binary file removed JetNews/debug.keystore
View file
Open in desktop
Binary file not shown.
Binary file added JetNews/debug_2.keystore
View file
Open in desktop
Binary file not shown.
Binary file removed Jetcaster/debug.keystore
View file
Open in desktop
Binary file not shown.
Binary file added Jetcaster/debug_2.keystore
View file
Open in desktop
Binary file not shown.
23 changes: 15 additions & 8 deletions Jetcaster/mobile/build.gradle.kts
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@ plugins {
alias(libs.plugins.hilt)
}


android {
compileSdk = libs.versions.compileSdk.get().toInt()
namespace = "com.example.jetcaster"
Expand All @@ -35,25 +36,31 @@ android {
}

signingConfigs {
// We use a bundled debug keystore, to allow debug builds from CI to be upgradable
// Important: change the keystore for a production deployment
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
val localKeystore = rootProject.file("debug_2.keystore")
val hasKeyInfo = userKeystore.exists()
named("debug") {
storeFile = rootProject.file("debug.keystore")
storePassword = "android"
keyAlias = "androiddebugkey"
keyPassword = "android"
// get from env variables
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")
keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
}
}

buildTypes {
getByName("debug") {
signingConfig = signingConfigs.getByName("debug")

}

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

Expand Down
15 changes: 9 additions & 6 deletions Jetchat/app/build.gradle.kts
View file
Open in desktop
Expand Up @@ -35,18 +35,21 @@ android {
}

signingConfigs {
// We use a bundled debug keystore, to allow debug builds from CI to be upgradable
// Important: change the keystore for a production deployment
val userKeystore = File(System.getProperty("user.home"), ".android/debug.keystore")
val localKeystore = rootProject.file("debug_2.keystore")
val hasKeyInfo = userKeystore.exists()
named("debug") {
storeFile = rootProject.file("debug.keystore")
storePassword = "android"
keyAlias = "androiddebugkey"
keyPassword = "android"
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")
keyPassword = if (hasKeyInfo) "android" else System.getenv("compose_key_password")
}
}

buildTypes {
getByName("debug") {
signingConfig = signingConfigs.getByName("debug")

}

getByName("release") {
Expand Down
Binary file removed Jetchat/debug.keystore
View file
Open in desktop
Binary file not shown.
Binary file added Jetchat/debug_2.keystore
View file
Open in desktop
Binary file not shown.