From 3f8be4e76d6c348709fd54a9e98ce1dbef42daf6 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Thu, 25 Apr 2024 15:22:34 +0100 Subject: [PATCH 01/13] Switch to using local debug keystore instead of packaged one. --- Jetcaster/app/build.gradle.kts | 2 +- Jetcaster/debug.keystore | Bin 2104 -> 0 bytes Jetsnack/app/build.gradle.kts | 3 ++- Jetsnack/debug.keystore | Bin 2104 -> 0 bytes 4 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 Jetcaster/debug.keystore delete mode 100644 Jetsnack/debug.keystore diff --git a/Jetcaster/app/build.gradle.kts b/Jetcaster/app/build.gradle.kts index 5d6a17a8ee..76cd3f2e69 100644 --- a/Jetcaster/app/build.gradle.kts +++ b/Jetcaster/app/build.gradle.kts @@ -37,7 +37,7 @@ android { signingConfigs { // We use a bundled debug keystore, to allow debug builds from CI to be upgradable named("debug") { - storeFile = rootProject.file("debug.keystore") + storeFile = File(System.getProperty("user.home"), ".android/debug.keystore") storePassword = "android" keyAlias = "androiddebugkey" keyPassword = "android" diff --git a/Jetcaster/debug.keystore b/Jetcaster/debug.keystore deleted file mode 100644 index 6024334a44d5daef9c2d82556060e6a29a6b9afb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2104 zcmbW%X*kr29tZH5F~eA9EZHJrE`w40(ZrO|BufcnFC=RwyFx>Q$;jFzNh156Jz0`< z>?)!~Ge<>{EwaZH#+h^Od2yfn^1k@K`M&r)zvuURo)7y6`v(XFf^Y)S9f{gXx{o;qkkLzeCjnL5OapwJ${&?Gmgt*!Y#8?^qY;smO4qcEXK~@Xf|Q z#v1)eK3Zl!l7_SC=jOX{W(W`UbiM|v-cqI4PK#fQijh$opsr-^kHrXq(qE&3r z2l074p>P*Q+W1YZ6I|M@h<@x}X{DvobBfn@(5WG1bf&^b<(`z?^lkTT$GDVpv28MC zbnv}N+YAN2lh$&Kz3QqPDi_fimhDA@m#37%>a>DHg46dSs11_Z_|f%>#m-~?B}E#1 z3XS{D`>ZrqjlLluWNhD+2eVhd>8dne)Li&si0#PZ>JJPx#^_u#aXg$=pn}wXX+Wi) zgkz)IP=bpVTPEu}X1A|C5PNZ9^Nww4`AmISUh)TraN?Pn_i{Jf*-?JfFLn*;+tsoG z=-6wmuCF7lmYfYM-_MmSULBs0W;!h5atn?AfG@k%xF3o63Db4-Dv{_${4!VP3Eg$) zababf-dNAN$FqH`;C$c@YULY^4^|S_G(-8rTq={nJ&#u8C!zTnlQSJp_RemojrOAu zvQ@Y?&E?D?D`@+{F)vbp$Spzr4ga^fcW8c2UWX*|x=U*ZV`y<1QromuVqB?(Wb3%W zzuEovT3+wr_l%}HjaO4kuR{Gnlg9J5`fJ%6Wg#|v1;y0o_{oW4bP+`Db8h4ifuiCg zi!2FtZh>Ux9Fo9U1)Is^qVn=St}NpR)n0r(93Or!Ql8+xxyv(hNC%3KN z#e5ZX9&pHo^Qnc&w9yN?Dy<^|KcoiMVN7Hx=4O_9x@6mC>ogEPp5Y#;)g{6&4$UX& zSsXW-$V%uw0Beq_v|y8&3TCSM#;{L1Hqv_fU2}AyScmb+{0O8Mf1c%Kd%xea<_+15 z2LrP*jn~qC_IDULSDvMKqc!ocii8 zvHWQhI>IY5dc9mnD0DyvRi|Y(GbnXFW?D4Y?U$x5ma@?7+m~=uXXeR4;%Y_{-Jr(h zJjS+{VYm0P+rGu|2tim&X{)?%Y(Aj=1s2DBr3K}RZ_>YM(mT;=C2oorAxzgckHt;E z9qTnIQZY>8M-1_V3i{}wRk2RD1z4*8sW>H_J6OHTU$FWkdn?!Aa-2X?)`mQTJ7AZ%-brZ*Kb=$-DvDPNVHvv za#9XaYF#8q>-=LielGui4I97&`k&;NZX{Js7Cvh3DEDZ(@_j7FeJ`G~B?v%9M88{& zwD(q4pIM7ogc|DF;5R-Dy>d?WENbRHv6K|nea~zaFtsuq+o!BNh}wN@lfW; zDQMHSDY0Ypc>V;n;p_xB%Jf(gM5;M@By_;$qqp%RpQWv`!H?n3J82!dr|{_fzk!5Z zRKo%|4w>@+4e|}3frlVqFo59Z#l)VC-9~UsR>(y4GadAmy}n`D@93YrZ1~MOOv3&98RC(1qEc;BmNz9_cx zy0+2j8)RlFskgm-f-$62clD&OB!+SFN2jV=Rr+MMc*iev!24*GL0pfLcv|W*={}#RfT;b^#AV!3^VP3Ru9Uc^o-N3u&`WMege11@B}9>gJ7(v` zzaMzQoyCe{jZX%q1Po;7=t+wgLyLqy3G{W|C;Ch?SY0!A9Q$;jFzNh156Jz0`< z>?)!~Ge<>{EwaZH#+h^Od2yfn^1k@K`M&r)zvuURo)7y6`v(XFf^Y)S9f{gXx{o;qkkLzeCjnL5OapwJ${&?Gmgt*!Y#8?^qY;smO4qcEXK~@Xf|Q z#v1)eK3Zl!l7_SC=jOX{W(W`UbiM|v-cqI4PK#fQijh$opsr-^kHrXq(qE&3r z2l074p>P*Q+W1YZ6I|M@h<@x}X{DvobBfn@(5WG1bf&^b<(`z?^lkTT$GDVpv28MC zbnv}N+YAN2lh$&Kz3QqPDi_fimhDA@m#37%>a>DHg46dSs11_Z_|f%>#m-~?B}E#1 z3XS{D`>ZrqjlLluWNhD+2eVhd>8dne)Li&si0#PZ>JJPx#^_u#aXg$=pn}wXX+Wi) zgkz)IP=bpVTPEu}X1A|C5PNZ9^Nww4`AmISUh)TraN?Pn_i{Jf*-?JfFLn*;+tsoG z=-6wmuCF7lmYfYM-_MmSULBs0W;!h5atn?AfG@k%xF3o63Db4-Dv{_${4!VP3Eg$) zababf-dNAN$FqH`;C$c@YULY^4^|S_G(-8rTq={nJ&#u8C!zTnlQSJp_RemojrOAu zvQ@Y?&E?D?D`@+{F)vbp$Spzr4ga^fcW8c2UWX*|x=U*ZV`y<1QromuVqB?(Wb3%W zzuEovT3+wr_l%}HjaO4kuR{Gnlg9J5`fJ%6Wg#|v1;y0o_{oW4bP+`Db8h4ifuiCg zi!2FtZh>Ux9Fo9U1)Is^qVn=St}NpR)n0r(93Or!Ql8+xxyv(hNC%3KN z#e5ZX9&pHo^Qnc&w9yN?Dy<^|KcoiMVN7Hx=4O_9x@6mC>ogEPp5Y#;)g{6&4$UX& zSsXW-$V%uw0Beq_v|y8&3TCSM#;{L1Hqv_fU2}AyScmb+{0O8Mf1c%Kd%xea<_+15 z2LrP*jn~qC_IDULSDvMKqc!ocii8 zvHWQhI>IY5dc9mnD0DyvRi|Y(GbnXFW?D4Y?U$x5ma@?7+m~=uXXeR4;%Y_{-Jr(h zJjS+{VYm0P+rGu|2tim&X{)?%Y(Aj=1s2DBr3K}RZ_>YM(mT;=C2oorAxzgckHt;E z9qTnIQZY>8M-1_V3i{}wRk2RD1z4*8sW>H_J6OHTU$FWkdn?!Aa-2X?)`mQTJ7AZ%-brZ*Kb=$-DvDPNVHvv za#9XaYF#8q>-=LielGui4I97&`k&;NZX{Js7Cvh3DEDZ(@_j7FeJ`G~B?v%9M88{& zwD(q4pIM7ogc|DF;5R-Dy>d?WENbRHv6K|nea~zaFtsuq+o!BNh}wN@lfW; zDQMHSDY0Ypc>V;n;p_xB%Jf(gM5;M@By_;$qqp%RpQWv`!H?n3J82!dr|{_fzk!5Z zRKo%|4w>@+4e|}3frlVqFo59Z#l)VC-9~UsR>(y4GadAmy}n`D@93YrZ1~MOOv3&98RC(1qEc;BmNz9_cx zy0+2j8)RlFskgm-f-$62clD&OB!+SFN2jV=Rr+MMc*iev!24*GL0pfLcv|W*={}#RfT;b^#AV!3^VP3Ru9Uc^o-N3u&`WMege11@B}9>gJ7(v` zzaMzQoyCe{jZX%q1Po;7=t+wgLyLqy3G{W|C;Ch?SY0!A9 Date: Thu, 25 Apr 2024 16:20:21 +0100 Subject: [PATCH 02/13] Switch other samples to use local debug keystore --- Crane/app/build.gradle.kts | 2 +- Crane/debug.keystore | Bin 2104 -> 0 bytes JetLagged/app/build.gradle.kts | 4 ++-- JetLagged/debug.keystore | Bin 2104 -> 0 bytes JetNews/app/build.gradle.kts | 4 ++-- JetNews/debug.keystore | Bin 2104 -> 0 bytes Jetcaster/app/build.gradle.kts | 2 +- Jetchat/app/build.gradle.kts | 4 ++-- Jetchat/debug.keystore | Bin 2104 -> 0 bytes Jetsnack/app/build.gradle.kts | 3 +-- Owl/app/build.gradle.kts | 4 ++-- Owl/debug.keystore | Bin 2104 -> 0 bytes Reply/app/build.gradle.kts | 4 ++-- Reply/debug.keystore | Bin 2747 -> 0 bytes 14 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 Crane/debug.keystore delete mode 100644 JetLagged/debug.keystore delete mode 100644 JetNews/debug.keystore delete mode 100644 Jetchat/debug.keystore delete mode 100644 Owl/debug.keystore delete mode 100644 Reply/debug.keystore diff --git a/Crane/app/build.gradle.kts b/Crane/app/build.gradle.kts index 641a1321b2..ff12a79b33 100644 --- a/Crane/app/build.gradle.kts +++ b/Crane/app/build.gradle.kts @@ -47,7 +47,7 @@ android { signingConfigs { // We use a bundled debug keystore, to allow debug builds from CI to be upgradable named("debug") { - storeFile = rootProject.file("debug.keystore") + storeFile = File(System.getProperty("user.home"), ".android/debug.keystore") storePassword = "android" keyAlias = "androiddebugkey" keyPassword = "android" diff --git a/Crane/debug.keystore b/Crane/debug.keystore deleted file mode 100644 index 6024334a44d5daef9c2d82556060e6a29a6b9afb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2104 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 From 7fc6f96960b6acf80c047702a9a93d91308f956d Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Fri, 26 Apr 2024 18:03:26 +0100 Subject: [PATCH 03/13] Upload new keystore with secret password, default to user.home debug.keystore --- .github/workflows/build-sample.yml | 4 ++++ Crane/app/build.gradle.kts | 12 +++++++----- Crane/debug_2.keystore | Bin 0 -> 2522 bytes JetLagged/app/build.gradle.kts | 11 +++++++---- JetLagged/debug_2.keystore | Bin 0 -> 2522 bytes JetNews/app/build.gradle.kts | 11 +++++++---- JetNews/debug_2.keystore | Bin 0 -> 2522 bytes Jetcaster/app/build.gradle.kts | 21 ++++++++++++++------- Jetcaster/debug_2.keystore | Bin 0 -> 2522 bytes Jetchat/app/build.gradle.kts | 11 +++++++---- Jetchat/debug_2.keystore | Bin 0 -> 2522 bytes Jetsnack/app/build.gradle.kts | 14 +++++++++----- Jetsnack/debug_2.keystore | Bin 0 -> 2522 bytes Owl/app/build.gradle.kts | 11 +++++++---- Owl/debug_2.keystore | Bin 0 -> 2522 bytes Reply/app/build.gradle.kts | 12 ++++++++---- Reply/debug_2.keystore | Bin 0 -> 2522 bytes 17 files changed, 70 insertions(+), 37 deletions(-) create mode 100644 Crane/debug_2.keystore create mode 100644 JetLagged/debug_2.keystore create mode 100644 JetNews/debug_2.keystore create mode 100644 Jetcaster/debug_2.keystore create mode 100644 Jetchat/debug_2.keystore create mode 100644 Jetsnack/debug_2.keystore create mode 100644 Owl/debug_2.keystore create mode 100644 Reply/debug_2.keystore diff --git a/.github/workflows/build-sample.yml b/.github/workflows/build-sample.yml index b1e03607b6..ff478d037d 100644 --- a/.github/workflows/build-sample.yml +++ b/.github/workflows/build-sample.yml @@ -57,6 +57,10 @@ jobs: - name: Build release working-directory: ${{ inputs.path }} run: ./gradlew assembleRelease --stacktrace + env: + compose_store_password: ${{secrets.compose_store_password}} + compose_key_alias: $${{secrets.compose_key_alias}} + compose_key_password: $${{secrets.compose_key_password}} - name: Run local tests working-directory: ${{ inputs.path }} diff --git a/Crane/app/build.gradle.kts b/Crane/app/build.gradle.kts index ff12a79b33..6ea2a52d50 100644 --- a/Crane/app/build.gradle.kts +++ b/Crane/app/build.gradle.kts @@ -45,12 +45,14 @@ 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 = File(System.getProperty("user.home"), ".android/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") } } diff --git a/Crane/debug_2.keystore b/Crane/debug_2.keystore new file mode 100644 index 0000000000000000000000000000000000000000..b42c971788ded31a5aef28c1e09d37a6b7d5e2ff GIT binary patch literal 2522 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 Lb=jx?b)tU)&rg|N literal 0 HcmV?d00001 diff --git a/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts index d452f05e01..61bb5a3790 100644 --- a/JetLagged/app/build.gradle.kts +++ b/JetLagged/app/build.gradle.kts @@ -35,11 +35,14 @@ android { signingConfigs { // 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 = File(System.getProperty("user.home"), ".android/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") } } diff --git a/JetLagged/debug_2.keystore b/JetLagged/debug_2.keystore new file mode 100644 index 0000000000000000000000000000000000000000..b42c971788ded31a5aef28c1e09d37a6b7d5e2ff GIT binary patch literal 2522 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 Lb=jx?b)tU)&rg|N literal 0 HcmV?d00001 diff --git a/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts index 1b89cd7df0..0d807bfa31 100644 --- a/JetNews/app/build.gradle.kts +++ b/JetNews/app/build.gradle.kts @@ -35,11 +35,14 @@ android { signingConfigs { // 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 = File(System.getProperty("user.home"), ".android/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") } } diff --git a/JetNews/debug_2.keystore b/JetNews/debug_2.keystore new file mode 100644 index 0000000000000000000000000000000000000000..b42c971788ded31a5aef28c1e09d37a6b7d5e2ff GIT binary patch literal 2522 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 Lb=jx?b)tU)&rg|N literal 0 HcmV?d00001 diff --git a/Jetcaster/app/build.gradle.kts b/Jetcaster/app/build.gradle.kts index 10b03b691c..47cfafd312 100644 --- a/Jetcaster/app/build.gradle.kts +++ b/Jetcaster/app/build.gradle.kts @@ -21,6 +21,7 @@ plugins { alias(libs.plugins.hilt) } + android { compileSdk = libs.versions.compileSdk.get().toInt() namespace = "com.example.jetcaster" @@ -36,24 +37,30 @@ android { signingConfigs { // 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 = File(System.getProperty("user.home"), ".android/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" + ) } } diff --git a/Jetcaster/debug_2.keystore b/Jetcaster/debug_2.keystore new file mode 100644 index 0000000000000000000000000000000000000000..b42c971788ded31a5aef28c1e09d37a6b7d5e2ff GIT binary patch literal 2522 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 Lb=jx?b)tU)&rg|N literal 0 HcmV?d00001 diff --git a/Jetchat/app/build.gradle.kts b/Jetchat/app/build.gradle.kts index a618fa4944..4a6e47bae0 100644 --- a/Jetchat/app/build.gradle.kts +++ b/Jetchat/app/build.gradle.kts @@ -36,11 +36,14 @@ android { signingConfigs { // 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 = File(System.getProperty("user.home"), ".android/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") } } diff --git a/Jetchat/debug_2.keystore b/Jetchat/debug_2.keystore new file mode 100644 index 0000000000000000000000000000000000000000..b42c971788ded31a5aef28c1e09d37a6b7d5e2ff GIT binary patch literal 2522 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 Lb=jx?b)tU)&rg|N literal 0 HcmV?d00001 diff --git a/Jetsnack/app/build.gradle.kts b/Jetsnack/app/build.gradle.kts index 0be3cbbbff..cc174a86ce 100644 --- a/Jetsnack/app/build.gradle.kts +++ b/Jetsnack/app/build.gradle.kts @@ -35,16 +35,20 @@ android { signingConfigs { // 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 = File(System.getProperty("user.home"), ".android/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 = null signingConfig = signingConfigs.getByName("debug") } @@ -57,7 +61,7 @@ android { create("benchmark") { initWith(getByName("release")) - signingConfig = signingConfigs.getByName("debug") + // signingConfig = signingConfigs.getByName("debug") matchingFallbacks.add("release") proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-benchmark-rules.pro") diff --git a/Jetsnack/debug_2.keystore b/Jetsnack/debug_2.keystore new file mode 100644 index 0000000000000000000000000000000000000000..b42c971788ded31a5aef28c1e09d37a6b7d5e2ff GIT binary patch literal 2522 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 Lb=jx?b)tU)&rg|N literal 0 HcmV?d00001 diff --git a/Owl/app/build.gradle.kts b/Owl/app/build.gradle.kts index 8119b65657..a231314cb7 100644 --- a/Owl/app/build.gradle.kts +++ b/Owl/app/build.gradle.kts @@ -35,11 +35,14 @@ android { signingConfigs { // 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 = File(System.getProperty("user.home"), ".android/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") } } diff --git a/Owl/debug_2.keystore b/Owl/debug_2.keystore new file mode 100644 index 0000000000000000000000000000000000000000..b42c971788ded31a5aef28c1e09d37a6b7d5e2ff GIT binary patch literal 2522 zcma)8c{tPy7oK5e7+ZF_8cVhie$%yNZA`MJiMX=NWwI1fBD*ZZ#2ulrFPFwB*_kN& zSflJ)mdG+x7Y&o0lGPJly*j_5kqEs{f*(`4Bub_ZZGPjx-qO-zqK+Fbf$EMID2>fcrlRC^ujS zod37w0+b+vdr`_MwXG{$SX6y#zVS;in=OAo3yVB23s@51g0cT+BMTe~0uV5`^FtG` z8!H5?2;q&`^+cO#OLP>a1so893SUC-kRdM9Ig3b7f0I&V5h6o3TAQl1Qo30x`m8=v z8D`f*i1g8Do}baF5$pF-!gf{ZpeqQdwl`zfG;wz2xO6@jZ|P@X!fH?`)|by-W9Ta* zU+SdI#M{@gJ0qiXFH%y>9&A#1GGDJeWFYXA-w(*rZZgAyyE#@^GhmUCHwd^}l}n-1 zYr5M8VhD7;-P^Nk88)Pigd&S9ao}~M#iax(qK2kCvmy9YXoPh_&L-6tl~Uh`yK{t; zLMEsdG+d_|^Ffuvrz&UxX!og&6@#JF&MIDx z>N~M@%n~hm!&za2(roYMy(G&Y^Jb$YE`sDy=OC?lSe9JH9zoRZvR@JVWTbgNv?=1c z6zx=O-;w8&5t?OdFX`+WA}&?Fjdv^QO4!B?VR3%=dlk1wH5*k$$)(eYX}2MfMR-1z ztyC4^rw{$HVf$yymd=cY;RF;$-We5_#D)rv80+VqK-Ph5e}a(8X6 zYnul%JvS6BX;bb;L4q1PyiIIrU6$qtNy5?-gAGw$n}~JSsR{p_j65y_?VP@S;`7w= zWx?T!3RDukqOr61Wwfr_cJE;<#m4Q-2Lxp^iwE_Ywbd~WU-1P+Wye|fr|Jnpko_Y) z*3d8e1y(OQ6m=s$LC9=sL1ThezJDZ5&>R2uDuL?H%nx2QrFwYOQCJD2a@&>~L(E@zP6t2@Fwx3OY)`N3q^w!#I zxIWK(u^v#&AJlJ_`RYs##H<0>U|w$(#jjw>|Y`>?%c3x&Fp1l`R@!N zYR^HLAWV^&k#dzRK7d}*c!aIS-g z7ry3Rh(x0QGQGb|6)uS673TrDfbN34K|aUX599_&{YwiW1tI*_9^P(}NKK>~QcVM? zfmGMf0`RQVe}>p#WIQY77|LS-gN{qazYO?)8FgFq3+{~={ojzdE+dC}%Zj(PhRpxR zsKq@d7>e|@Vo~ADdimfny+}N(#d{-ot}Ff1-4$Um1o6e43<-Q zgex9$X!d@ydqq!XoV>`RdLaV&y})s+u-xp0SFA1j2QnsPTcTKESLKr6*JM4g90?8mLXKbo(^JYjQWleZ0u=-I~dpVvTV>tvP4A zzIaXC{|wN)+4yY3?ZlZ*bF|-R!A`W({IwfR`vXUXnAiPIg$oir9wRy)Em@auZStok zPEM$X4PcrhFOJQ+^gnVIkyelP{yDY3Qd;v)proSdnjO?VQZKbIif@KWu)XrTCe=ki zcn2_?8*tJS9u-Vp=^FSfNr|?(F+2~>Eytu$cYtw5ozpPh$Yb$whyErzHLZL!^jjJy zmc97vp;VNk*uCUG9^1jFDpqG#xxb6dT!+oECcOAA)4rHXBWp1;7PBH(Tudr6$Na3x zE9!d#mN8*M&#d#}8mb9~XS((13?8x4x+40!027T)BgSo_nD%TV$p`vFy+=S%6y9N} zU{g?YVP}V`C0%yU#T6ryJjaaZLljS;oKGq~M>XAz|FV*{xa(3#a!3qpEYf)lR{>up zB-sw@M=?ZPfrjc+t(c1~-RAj-U>e7*Ay8GYV4*THxVst-nO99}dkBxnT^xf3ygvY0 zb(~XLUKvr6)0h4L&npfyU-FOHL1g7B3=6H~B~)6q?}St4f7)YS*ReYC)G@+!t|_pD zaw?&fd2V3}3+}ESkfw9IvV3mlSEX~c4G<;H`OH1n59z&0pxFsjZx?(b(=vn{)^Bp0 z#$@MO_jlUQs}E1e5mwu)(vT6m?-ufIn~01a+J~MyQ8-?UN$Oe(Gsvj|QJXh#`}rTM zXv<-aB`P&cV))0)v2Q={ML^vurXKu~i$6Q}FVuuK-Y`cz_nVaaQJRzMor835^ Lb=jx?b)tU)&rg|N literal 0 HcmV?d00001 diff --git a/Reply/app/build.gradle.kts b/Reply/app/build.gradle.kts index 178c2d6073..7dd74035d2 100644 --- a/Reply/app/build.gradle.kts +++ b/Reply/app/build.gradle.kts @@ -35,11 +35,15 @@ android { signingConfigs { // 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 = File(System.getProperty("user.home"), ".android/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") } } diff --git a/Reply/debug_2.keystore b/Reply/debug_2.keystore new file mode 100644 index 0000000000000000000000000000000000000000..b42c971788ded31a5aef28c1e09d37a6b7d5e2ff GIT binary patch literal 2522 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 Lb=jx?b)tU)&rg|N literal 0 HcmV?d00001 From 51b083107f508442134d9014f3884822c23d38c7 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Fri, 26 Apr 2024 19:45:41 +0100 Subject: [PATCH 04/13] Remove debug signing config --- Crane/app/build.gradle.kts | 1 - JetLagged/app/build.gradle.kts | 2 +- JetNews/app/build.gradle.kts | 2 +- Jetchat/app/build.gradle.kts | 2 +- Jetsnack/app/build.gradle.kts | 3 +-- Owl/app/build.gradle.kts | 2 +- Reply/app/build.gradle.kts | 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Crane/app/build.gradle.kts b/Crane/app/build.gradle.kts index 6ea2a52d50..09edb0705b 100644 --- a/Crane/app/build.gradle.kts +++ b/Crane/app/build.gradle.kts @@ -58,7 +58,6 @@ android { buildTypes { getByName("debug") { - signingConfig = signingConfigs.getByName("debug") } getByName("release") { diff --git a/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts index 61bb5a3790..e19c3a8e09 100644 --- a/JetLagged/app/build.gradle.kts +++ b/JetLagged/app/build.gradle.kts @@ -48,7 +48,7 @@ android { buildTypes { getByName("debug") { - signingConfig = signingConfigs.getByName("debug") + } getByName("release") { diff --git a/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts index 0d807bfa31..621ea55542 100644 --- a/JetNews/app/build.gradle.kts +++ b/JetNews/app/build.gradle.kts @@ -48,7 +48,7 @@ android { buildTypes { getByName("debug") { - signingConfig = signingConfigs.getByName("debug") + } getByName("release") { diff --git a/Jetchat/app/build.gradle.kts b/Jetchat/app/build.gradle.kts index 4a6e47bae0..12c3ba1762 100644 --- a/Jetchat/app/build.gradle.kts +++ b/Jetchat/app/build.gradle.kts @@ -49,7 +49,7 @@ android { buildTypes { getByName("debug") { - signingConfig = signingConfigs.getByName("debug") + } getByName("release") { diff --git a/Jetsnack/app/build.gradle.kts b/Jetsnack/app/build.gradle.kts index cc174a86ce..61e3a7f4f5 100644 --- a/Jetsnack/app/build.gradle.kts +++ b/Jetsnack/app/build.gradle.kts @@ -48,8 +48,7 @@ android { buildTypes { getByName("debug") { - signingConfig = null - signingConfig = signingConfigs.getByName("debug") + } getByName("release") { diff --git a/Owl/app/build.gradle.kts b/Owl/app/build.gradle.kts index a231314cb7..6697c3f6fe 100644 --- a/Owl/app/build.gradle.kts +++ b/Owl/app/build.gradle.kts @@ -48,7 +48,7 @@ android { buildTypes { getByName("debug") { - signingConfig = signingConfigs.getByName("debug") + } getByName("release") { diff --git a/Reply/app/build.gradle.kts b/Reply/app/build.gradle.kts index 7dd74035d2..38e17e5e38 100644 --- a/Reply/app/build.gradle.kts +++ b/Reply/app/build.gradle.kts @@ -49,7 +49,7 @@ android { buildTypes { getByName("debug") { - signingConfig = signingConfigs.getByName("debug") + } getByName("release") { From 1683211f75ecafc39b2bf789b29cd7be24d25ac9 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Fri, 26 Apr 2024 20:51:20 +0100 Subject: [PATCH 05/13] Move env variables to all steps. --- .github/workflows/build-sample.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-sample.yml b/.github/workflows/build-sample.yml index ff478d037d..63f7ae4df3 100644 --- a/.github/workflows/build-sample.yml +++ b/.github/workflows/build-sample.yml @@ -9,6 +9,10 @@ on: path: 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 }} @@ -57,10 +61,6 @@ jobs: - name: Build release working-directory: ${{ inputs.path }} run: ./gradlew assembleRelease --stacktrace - env: - compose_store_password: ${{secrets.compose_store_password}} - compose_key_alias: $${{secrets.compose_key_alias}} - compose_key_password: $${{secrets.compose_key_password}} - name: Run local tests working-directory: ${{ inputs.path }} From 33796df2370894f88b9ee9eb09694cd7d91ad23e Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Sat, 27 Apr 2024 15:54:37 +0100 Subject: [PATCH 06/13] Changed to uppercase for secret retrieval --- .github/workflows/build-sample.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-sample.yml b/.github/workflows/build-sample.yml index 7d8cefe6f5..1fba3616c8 100644 --- a/.github/workflows/build-sample.yml +++ b/.github/workflows/build-sample.yml @@ -13,9 +13,9 @@ on: default: "app" type: string env: - compose_store_password: ${{secrets.compose_store_password}} - compose_key_alias: $${{secrets.compose_key_alias}} - compose_key_password: $${{secrets.compose_key_password}} + 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 }} From 727a2e5f581d285acfd9189d20cb4c9a3aaa838b Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Sat, 27 Apr 2024 16:04:15 +0100 Subject: [PATCH 07/13] Add as input for each yaml file. --- .github/workflows/Crane.yaml | 3 +++ .github/workflows/JetLagged.yaml | 3 +++ .github/workflows/JetNews.yaml | 3 +++ .github/workflows/Jetcaster.yaml | 3 +++ .github/workflows/Jetchat.yaml | 4 +++- .github/workflows/Jetsnack.yaml | 3 +++ .github/workflows/Jetsurvey.yaml | 3 +++ .github/workflows/Owl.yaml | 3 +++ .github/workflows/Release.yml | 5 ++++- .github/workflows/Reply.yaml | 5 ++++- .github/workflows/build-sample.yml | 6 +----- .github/workflows/test-snapshot.yml | 5 ++++- .github/workflows/update_deps.yml | 5 ++++- 13 files changed, 41 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Crane.yaml b/.github/workflows/Crane.yaml index 1e099028c8..5b92f5783d 100644 --- a/.github/workflows/Crane.yaml +++ b/.github/workflows/Crane.yaml @@ -22,6 +22,9 @@ jobs: with: name: Crane path: Crane + compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} + compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} test: needs: build diff --git a/.github/workflows/JetLagged.yaml b/.github/workflows/JetLagged.yaml index 768e069273..761799b86d 100644 --- a/.github/workflows/JetLagged.yaml +++ b/.github/workflows/JetLagged.yaml @@ -22,6 +22,9 @@ jobs: with: name: JetLagged path: JetLagged + compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} + compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} test: needs: build diff --git a/.github/workflows/JetNews.yaml b/.github/workflows/JetNews.yaml index 47361b46b4..1a4aeb84eb 100644 --- a/.github/workflows/JetNews.yaml +++ b/.github/workflows/JetNews.yaml @@ -22,6 +22,9 @@ jobs: with: name: JetNews path: JetNews + compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} + compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} androidTest: needs: build diff --git a/.github/workflows/Jetcaster.yaml b/.github/workflows/Jetcaster.yaml index 6e8d9859eb..66edfa4d7d 100644 --- a/.github/workflows/Jetcaster.yaml +++ b/.github/workflows/Jetcaster.yaml @@ -20,3 +20,6 @@ jobs: name: Jetcaster path: Jetcaster module: mobile + compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} + compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} diff --git a/.github/workflows/Jetchat.yaml b/.github/workflows/Jetchat.yaml index e82e776e49..74803c2bb1 100644 --- a/.github/workflows/Jetchat.yaml +++ b/.github/workflows/Jetchat.yaml @@ -22,7 +22,9 @@ jobs: with: name: Jetchat path: Jetchat - + 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 diff --git a/.github/workflows/Jetsnack.yaml b/.github/workflows/Jetsnack.yaml index 6af00f354f..a6e9137c2f 100644 --- a/.github/workflows/Jetsnack.yaml +++ b/.github/workflows/Jetsnack.yaml @@ -19,3 +19,6 @@ jobs: with: name: Jetsnack path: Jetsnack + compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} + compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} diff --git a/.github/workflows/Jetsurvey.yaml b/.github/workflows/Jetsurvey.yaml index 086cf1aeb9..120e69cc75 100644 --- a/.github/workflows/Jetsurvey.yaml +++ b/.github/workflows/Jetsurvey.yaml @@ -19,3 +19,6 @@ jobs: with: name: Jetsurvey path: Jetsurvey + compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} + compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} diff --git a/.github/workflows/Owl.yaml b/.github/workflows/Owl.yaml index d84d8b72d3..ec9415477d 100644 --- a/.github/workflows/Owl.yaml +++ b/.github/workflows/Owl.yaml @@ -22,6 +22,9 @@ jobs: with: name: Owl path: Owl + compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} + compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} test: needs: build diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index a8e467699d..68321ef73e 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -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 diff --git a/.github/workflows/Reply.yaml b/.github/workflows/Reply.yaml index 5809b07720..5d78a8dffc 100644 --- a/.github/workflows/Reply.yaml +++ b/.github/workflows/Reply.yaml @@ -22,10 +22,13 @@ jobs: with: name: Reply path: Reply + 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: macOS-latest # enables hardware acceleration in the virtual machine timeout-minutes: 30 strategy: matrix: diff --git a/.github/workflows/build-sample.yml b/.github/workflows/build-sample.yml index 1fba3616c8..2fc3ace122 100644 --- a/.github/workflows/build-sample.yml +++ b/.github/workflows/build-sample.yml @@ -12,11 +12,7 @@ on: module: default: "app" 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 diff --git a/.github/workflows/test-snapshot.yml b/.github/workflows/test-snapshot.yml index ea911c1eb4..13183d3deb 100644 --- a/.github/workflows/test-snapshot.yml +++ b/.github/workflows/test-snapshot.yml @@ -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 diff --git a/.github/workflows/update_deps.yml b/.github/workflows/update_deps.yml index 94d97a8871..652b6b6bf1 100644 --- a/.github/workflows/update_deps.yml +++ b/.github/workflows/update_deps.yml @@ -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 From 092268e1df0c6899c5a77ae30cf6f6095655ed90 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Sat, 27 Apr 2024 16:13:59 +0100 Subject: [PATCH 08/13] Add secrets heading --- .github/workflows/Crane.yaml | 1 + .github/workflows/JetLagged.yaml | 1 + .github/workflows/JetNews.yaml | 1 + .github/workflows/Jetcaster.yaml | 1 + .github/workflows/Jetchat.yaml | 1 + .github/workflows/Jetsnack.yaml | 1 + .github/workflows/Jetsurvey.yaml | 1 + .github/workflows/Owl.yaml | 1 + .github/workflows/Reply.yaml | 1 + 9 files changed, 9 insertions(+) diff --git a/.github/workflows/Crane.yaml b/.github/workflows/Crane.yaml index 5b92f5783d..e1f2152ab6 100644 --- a/.github/workflows/Crane.yaml +++ b/.github/workflows/Crane.yaml @@ -22,6 +22,7 @@ jobs: 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 }} diff --git a/.github/workflows/JetLagged.yaml b/.github/workflows/JetLagged.yaml index 761799b86d..7349e08f97 100644 --- a/.github/workflows/JetLagged.yaml +++ b/.github/workflows/JetLagged.yaml @@ -22,6 +22,7 @@ jobs: 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 }} diff --git a/.github/workflows/JetNews.yaml b/.github/workflows/JetNews.yaml index 1a4aeb84eb..3368e6fdb5 100644 --- a/.github/workflows/JetNews.yaml +++ b/.github/workflows/JetNews.yaml @@ -22,6 +22,7 @@ jobs: 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 }} diff --git a/.github/workflows/Jetcaster.yaml b/.github/workflows/Jetcaster.yaml index 66edfa4d7d..1ae89aedd9 100644 --- a/.github/workflows/Jetcaster.yaml +++ b/.github/workflows/Jetcaster.yaml @@ -20,6 +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 }} diff --git a/.github/workflows/Jetchat.yaml b/.github/workflows/Jetchat.yaml index 74803c2bb1..bc2665d918 100644 --- a/.github/workflows/Jetchat.yaml +++ b/.github/workflows/Jetchat.yaml @@ -22,6 +22,7 @@ jobs: 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 }} diff --git a/.github/workflows/Jetsnack.yaml b/.github/workflows/Jetsnack.yaml index a6e9137c2f..3379b08cef 100644 --- a/.github/workflows/Jetsnack.yaml +++ b/.github/workflows/Jetsnack.yaml @@ -19,6 +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 }} diff --git a/.github/workflows/Jetsurvey.yaml b/.github/workflows/Jetsurvey.yaml index 120e69cc75..e47a686980 100644 --- a/.github/workflows/Jetsurvey.yaml +++ b/.github/workflows/Jetsurvey.yaml @@ -19,6 +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 }} diff --git a/.github/workflows/Owl.yaml b/.github/workflows/Owl.yaml index ec9415477d..3769378cd1 100644 --- a/.github/workflows/Owl.yaml +++ b/.github/workflows/Owl.yaml @@ -22,6 +22,7 @@ jobs: 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 }} diff --git a/.github/workflows/Reply.yaml b/.github/workflows/Reply.yaml index 5d78a8dffc..f1b43779ff 100644 --- a/.github/workflows/Reply.yaml +++ b/.github/workflows/Reply.yaml @@ -22,6 +22,7 @@ jobs: 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 }} From cd9aab970fe331a8a337a9c73fa66d861303922f Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Sat, 27 Apr 2024 16:18:02 +0100 Subject: [PATCH 09/13] add inputs to workflow --- .github/workflows/build-sample.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-sample.yml b/.github/workflows/build-sample.yml index 2fc3ace122..ef02567888 100644 --- a/.github/workflows/build-sample.yml +++ b/.github/workflows/build-sample.yml @@ -12,7 +12,16 @@ 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 From ae58d32c673033accc6ccafaf383bf79f360a822 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Sat, 27 Apr 2024 16:34:07 +0100 Subject: [PATCH 10/13] add as env variable --- .github/workflows/build-sample.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-sample.yml b/.github/workflows/build-sample.yml index ef02567888..c47ed44618 100644 --- a/.github/workflows/build-sample.yml +++ b/.github/workflows/build-sample.yml @@ -25,7 +25,10 @@ on: 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 From 0c468f440c76806bf1475831143e0e3418a4b8af Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Sat, 27 Apr 2024 16:44:12 +0100 Subject: [PATCH 11/13] Remove duplicate $ --- .github/workflows/Crane.yaml | 4 ++-- .github/workflows/JetLagged.yaml | 4 ++-- .github/workflows/JetNews.yaml | 4 ++-- .github/workflows/Jetcaster.yaml | 4 ++-- .github/workflows/Jetchat.yaml | 4 ++-- .github/workflows/Jetsnack.yaml | 4 ++-- .github/workflows/Jetsurvey.yaml | 4 ++-- .github/workflows/Owl.yaml | 4 ++-- .github/workflows/Release.yml | 4 ++-- .github/workflows/Reply.yaml | 4 ++-- .github/workflows/build-sample.yml | 4 ++-- .github/workflows/update_deps.yml | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/Crane.yaml b/.github/workflows/Crane.yaml index e1f2152ab6..e0d0254d0a 100644 --- a/.github/workflows/Crane.yaml +++ b/.github/workflows/Crane.yaml @@ -24,8 +24,8 @@ jobs: path: Crane secrets: compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} - compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} - compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} + compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }} test: needs: build diff --git a/.github/workflows/JetLagged.yaml b/.github/workflows/JetLagged.yaml index 7349e08f97..855e2a2a99 100644 --- a/.github/workflows/JetLagged.yaml +++ b/.github/workflows/JetLagged.yaml @@ -24,8 +24,8 @@ jobs: path: JetLagged secrets: compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} - compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} - compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} + compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }} test: needs: build diff --git a/.github/workflows/JetNews.yaml b/.github/workflows/JetNews.yaml index 3368e6fdb5..9e444fa4f2 100644 --- a/.github/workflows/JetNews.yaml +++ b/.github/workflows/JetNews.yaml @@ -24,8 +24,8 @@ jobs: path: JetNews secrets: compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} - compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} - compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} + compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }} androidTest: needs: build diff --git a/.github/workflows/Jetcaster.yaml b/.github/workflows/Jetcaster.yaml index 1ae89aedd9..44c15fe1ce 100644 --- a/.github/workflows/Jetcaster.yaml +++ b/.github/workflows/Jetcaster.yaml @@ -22,5 +22,5 @@ jobs: module: mobile secrets: compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} - compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} - compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} + compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }} diff --git a/.github/workflows/Jetchat.yaml b/.github/workflows/Jetchat.yaml index bc2665d918..fac97c631f 100644 --- a/.github/workflows/Jetchat.yaml +++ b/.github/workflows/Jetchat.yaml @@ -24,8 +24,8 @@ jobs: path: Jetchat secrets: compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} - compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} - compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} + compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }} test: needs: build runs-on: ubuntu-latest diff --git a/.github/workflows/Jetsnack.yaml b/.github/workflows/Jetsnack.yaml index 3379b08cef..1962c2c789 100644 --- a/.github/workflows/Jetsnack.yaml +++ b/.github/workflows/Jetsnack.yaml @@ -21,5 +21,5 @@ jobs: path: Jetsnack secrets: compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} - compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} - compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} + compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }} diff --git a/.github/workflows/Jetsurvey.yaml b/.github/workflows/Jetsurvey.yaml index e47a686980..1cf681f922 100644 --- a/.github/workflows/Jetsurvey.yaml +++ b/.github/workflows/Jetsurvey.yaml @@ -21,5 +21,5 @@ jobs: path: Jetsurvey secrets: compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} - compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} - compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} + compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }} diff --git a/.github/workflows/Owl.yaml b/.github/workflows/Owl.yaml index 3769378cd1..f8c5d15d20 100644 --- a/.github/workflows/Owl.yaml +++ b/.github/workflows/Owl.yaml @@ -24,8 +24,8 @@ jobs: path: Owl secrets: compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} - compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} - compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} + compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }} test: needs: build diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 68321ef73e..21bc6a993a 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -6,8 +6,8 @@ on: - 'v*' env: compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} - compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} - compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} + compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }} jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/Reply.yaml b/.github/workflows/Reply.yaml index f1b43779ff..5db3c31fe9 100644 --- a/.github/workflows/Reply.yaml +++ b/.github/workflows/Reply.yaml @@ -24,8 +24,8 @@ jobs: path: Reply secrets: compose_store_password: ${{ secrets.COMPOSE_STORE_PASSWORD }} - compose_key_alias: $${{ secrets.COMPOSE_KEY_ALIAS }} - compose_key_password: $${{ secrets.COMPOSE_KEY_PASSWORD }} + compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }} test: needs: build diff --git a/.github/workflows/build-sample.yml b/.github/workflows/build-sample.yml index c47ed44618..8b210d7448 100644 --- a/.github/workflows/build-sample.yml +++ b/.github/workflows/build-sample.yml @@ -27,8 +27,8 @@ concurrency: 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 }} + compose_key_alias: ${{ secrets.compose_key_alias }} + compose_key_password: ${{ secrets.compose_key_password }} jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/update_deps.yml b/.github/workflows/update_deps.yml index 652b6b6bf1..9d417409d3 100644 --- a/.github/workflows/update_deps.yml +++ b/.github/workflows/update_deps.yml @@ -4,8 +4,8 @@ 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 }} + compose_key_alias: ${{ secrets.COMPOSE_KEY_ALIAS }} + compose_key_password: ${{ secrets.COMPOSE_KEY_PASSWORD }} jobs: build: runs-on: ubuntu-latest From 66e8f0db97542b9ccdfab613c42a7b1916b1dd05 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Sat, 27 Apr 2024 17:04:42 +0100 Subject: [PATCH 12/13] add to test env --- .github/workflows/Crane.yaml | 4 +++- .github/workflows/JetLagged.yaml | 4 +++- .github/workflows/JetNews.yaml | 4 +++- .github/workflows/Jetchat.yaml | 4 +++- .github/workflows/Owl.yaml | 4 +++- .github/workflows/Reply.yaml | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/Crane.yaml b/.github/workflows/Crane.yaml index e0d0254d0a..486661dd91 100644 --- a/.github/workflows/Crane.yaml +++ b/.github/workflows/Crane.yaml @@ -15,7 +15,9 @@ 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 diff --git a/.github/workflows/JetLagged.yaml b/.github/workflows/JetLagged.yaml index 855e2a2a99..d5d7f2d664 100644 --- a/.github/workflows/JetLagged.yaml +++ b/.github/workflows/JetLagged.yaml @@ -15,7 +15,9 @@ 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 diff --git a/.github/workflows/JetNews.yaml b/.github/workflows/JetNews.yaml index 9e444fa4f2..1478e8d103 100644 --- a/.github/workflows/JetNews.yaml +++ b/.github/workflows/JetNews.yaml @@ -15,7 +15,9 @@ 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 diff --git a/.github/workflows/Jetchat.yaml b/.github/workflows/Jetchat.yaml index fac97c631f..feb22ef6eb 100644 --- a/.github/workflows/Jetchat.yaml +++ b/.github/workflows/Jetchat.yaml @@ -15,7 +15,9 @@ 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 diff --git a/.github/workflows/Owl.yaml b/.github/workflows/Owl.yaml index f8c5d15d20..4aa740d5be 100644 --- a/.github/workflows/Owl.yaml +++ b/.github/workflows/Owl.yaml @@ -15,7 +15,9 @@ 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 diff --git a/.github/workflows/Reply.yaml b/.github/workflows/Reply.yaml index 5db3c31fe9..c487ff0135 100644 --- a/.github/workflows/Reply.yaml +++ b/.github/workflows/Reply.yaml @@ -15,7 +15,9 @@ 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 From b22b5a9da3851fb0dcd921081e6a28a5ec1fb421 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Mon, 29 Apr 2024 10:19:12 +0100 Subject: [PATCH 13/13] switch to ubuntu for reply --- .github/workflows/Reply.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Reply.yaml b/.github/workflows/Reply.yaml index c487ff0135..569f7f49dc 100644 --- a/.github/workflows/Reply.yaml +++ b/.github/workflows/Reply.yaml @@ -31,7 +31,7 @@ jobs: test: needs: build - runs-on: macOS-latest # enables hardware acceleration in the virtual machine + runs-on: ubuntu-latest # enables hardware acceleration in the virtual machine timeout-minutes: 30 strategy: matrix: