From cdb00abbe31e451227cb87e33e8471b7870ffd7d Mon Sep 17 00:00:00 2001 From: fabian Date: Fri, 9 Dec 2022 15:31:45 +0100 Subject: [PATCH 01/15] Deploy builds to seafile library --- .drone.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 82e296e..1075b61 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,9 +6,17 @@ name: Android steps: - name: build image: mingc/android-build-box + volumes: + - name: deploy + path: /tmp/deploy commands: - - ./gradlew build - when: - event: - - push - - pull_request \ No newline at end of file + - ./gradlew test + - ./gradlew assembleDebug + - ./gradlew bundleRelease + - cp app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/ + - cp app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/ + +volumes: + - name: deploy + host: + path: /mnt/seafile-sync-cli/TichuCounter \ No newline at end of file From 531bfb42b678542805ac34f3fa3111edadadbd28 Mon Sep 17 00:00:00 2001 From: fabian Date: Fri, 9 Dec 2022 15:52:42 +0100 Subject: [PATCH 02/15] Test gradle image --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1075b61..4c65ba6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ name: Android steps: - name: build - image: mingc/android-build-box + image: gradle:latest volumes: - name: deploy path: /tmp/deploy @@ -13,8 +13,8 @@ steps: - ./gradlew test - ./gradlew assembleDebug - ./gradlew bundleRelease - - cp app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/ - - cp app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/ + - cp app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/app-debug.apk + - cp app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/app-release.aab volumes: - name: deploy From 630f9689ad2560f5228855402c0ad52b2308ffe3 Mon Sep 17 00:00:00 2001 From: fabian Date: Fri, 9 Dec 2022 15:54:47 +0100 Subject: [PATCH 03/15] revert 531bfb42b678542805ac34f3fa3111edadadbd28 revert Test gradle image --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4c65ba6..1075b61 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ name: Android steps: - name: build - image: gradle:latest + image: mingc/android-build-box volumes: - name: deploy path: /tmp/deploy @@ -13,8 +13,8 @@ steps: - ./gradlew test - ./gradlew assembleDebug - ./gradlew bundleRelease - - cp app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/app-debug.apk - - cp app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/app-release.aab + - cp app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/ + - cp app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/ volumes: - name: deploy From 78059fd187c47198bf2dbe02a3fb96af893a76d8 Mon Sep 17 00:00:00 2001 From: fabian Date: Fri, 9 Dec 2022 15:57:38 +0100 Subject: [PATCH 04/15] Try rsync --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1075b61..3ce49ec 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,8 +13,8 @@ steps: - ./gradlew test - ./gradlew assembleDebug - ./gradlew bundleRelease - - cp app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/ - - cp app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/ + - rsync ./app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/ + - rsync ./app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/ volumes: - name: deploy From 6cec709476f41291c6a4f75b8b39417fd936865e Mon Sep 17 00:00:00 2001 From: fabian Date: Fri, 9 Dec 2022 16:03:51 +0100 Subject: [PATCH 05/15] Revert to cp make sure directory exists --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3ce49ec..b668aef 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,8 +13,9 @@ steps: - ./gradlew test - ./gradlew assembleDebug - ./gradlew bundleRelease - - rsync ./app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/ - - rsync ./app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/ + - mkdir /tmp/deploy/lastBuild + - cp ./app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/app-debug.apk + - cp ./app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/app-release.aab volumes: - name: deploy From 818965e16c3e3c53e83cafe67429bcc59c20d225 Mon Sep 17 00:00:00 2001 From: fabian Date: Fri, 9 Dec 2022 19:29:01 +0100 Subject: [PATCH 06/15] Create keystore.properties before build --- .drone.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.drone.yml b/.drone.yml index b668aef..fdae655 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,10 +6,20 @@ name: Android steps: - name: build image: mingc/android-build-box + environment: + STOREPASSWORD: + from_secret: StorePassword + KEYPASSWORD: + from_secret: KeyPassword volumes: - name: deploy path: /tmp/deploy commands: + - touch keystore.properties + - storePassword=$STOREPASSWORD >> keystore.properties + - keyPassword=$KEYPASSWORD >> keystore.properties + - keyAlias=key0 >> keystore.properties + - storeFile=../AndroidKey >> keystore.properties - ./gradlew test - ./gradlew assembleDebug - ./gradlew bundleRelease From 383162ea3a5118397552eacc29ffc16e3f850933 Mon Sep 17 00:00:00 2001 From: fabian Date: Fri, 9 Dec 2022 19:31:48 +0100 Subject: [PATCH 07/15] Output content of storefile temporarily --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index fdae655..87f37b7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,6 +20,7 @@ steps: - keyPassword=$KEYPASSWORD >> keystore.properties - keyAlias=key0 >> keystore.properties - storeFile=../AndroidKey >> keystore.properties + - cat keystore.properties - ./gradlew test - ./gradlew assembleDebug - ./gradlew bundleRelease From fe95de53b49665eaba5c9df9dea835e5f34f6361 Mon Sep 17 00:00:00 2001 From: fabian Date: Fri, 9 Dec 2022 19:33:31 +0100 Subject: [PATCH 08/15] revert 383162ea3a5118397552eacc29ffc16e3f850933 revert Output content of storefile temporarily --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 87f37b7..fdae655 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,6 @@ steps: - keyPassword=$KEYPASSWORD >> keystore.properties - keyAlias=key0 >> keystore.properties - storeFile=../AndroidKey >> keystore.properties - - cat keystore.properties - ./gradlew test - ./gradlew assembleDebug - ./gradlew bundleRelease From 3022e8442bd5883c69d1e4077bc0bea287df84bd Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Fri, 9 Dec 2022 19:19:32 +0100 Subject: [PATCH 09/15] Add keystore and build on sign on release --- .gitignore | 1 + AndroidKey | Bin 0 -> 2233 bytes app/build.gradle | 20 +++++++++++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 AndroidKey diff --git a/.gitignore b/.gitignore index f0f71e2..46cc5db 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ .externalNativeBuild .cxx .idea +keystore.properties diff --git a/AndroidKey b/AndroidKey new file mode 100644 index 0000000000000000000000000000000000000000..5d88afa1ab0dcaae41d768cf62abb7a79ac561d7 GIT binary patch literal 2233 zcmchY`8yN}7sqF{WE)9i-x_OV4AYDkNf@NWOqQ1sGj^h~ghO+z=#hhTMgfBBh)^^Oxwn-JtQ zc2e83h~Sf(sf8G~g?u;puL;e&mX{2>OW159kHL-8nwf<}_C;u#Jc-EzShJOVy0 zcL35+`>W+cBePkEqkrQOX`L|nQZszbw@&fRg4GWr`c?z_t0oMKs<-sfvD7Z#>J+ZW zQ&pmee1JN+tput+IaiQ100RR#N^#v~_iKbTvNA?s4HDINOtNzvw-rOWMA8p0@UIrd zRwgc4+od6R6)C!*_Hl%|v$Q}K!f_rP&$Fl$WN>T`t^;9r9NB)Vzol zp{Qm!?BMy_KUm8S)6Ns0MQJmZSm*Djy@t*Rci zJ}+bMxhu0utG{P@Rh)_Jk?Xn~eBl5oQom76!@ogai`i5EvgPm`qOl^i9Y<2BeE9Yj z=VqPdF|!aPyl1rX{P``0$|ilqRfCufbbr?m+h1ZkDGd(s2-qvfu$7j4qlHdL^DeeXXtG=DJ%sY0F8eRWY1N-u+}z z^~!WYDq~Q^_nTb|nUhd9XS#CVPy9#uX+_PhPHKfiM)uB769wq6{xnhK>!gOBmetYa zIoG)E-CF9pQetXnr8Nd~qjzYsS$oHd3Hm(88;N{Dzhr)+NtLLYzl49tma9E&@q>nI zZ7fjSfR@?BD<0oSY!2Cz_nz*c-d`q&KJUXrT`{jAL5Muj+Sf4JS~j6V;qB4P)&}M* zJw<`44*4Zu0@fX>B93ylyD-##raUc9A(r#omEN@3(+~Ciy?n&8Eygk>^|*^{Iqm}% zvt*5ZH?rE``JP*^$%kuw;)$EK3wEK*nHhc&H_zn#yyxH$WlwHgk)9`yjBJ0l`N^5# zM=PAt93c7OVkIsr1^0HVAv1{pLvV{y*9ot^BMDfxZ_B^Umr|qDW^|S+pFx~;ISmpS zZ=>z|9bWNL#q!SAI`f(U=q*~+x6aOHhoNN2v6rfQakCR294?t+eyph)$uw4vPuRU% zE&XEK%y{YORMfue61wP}P%NF06f{&W4;Z-8YvtuWKkA1&bZ;IT8%%LY-WR8E)7SvZ%K_*v!cv?0J)k446jZX=aWuytxxDoJ^*4#LCoazW_7EQok z2Z_Bi3me-A8iAp8ST3{)*Y_g^zdtqMG{pDv&e!`D`Y1erMXj%da6U`FQnZ_w+dIOE zny*fqF!3OL{vLdMtC=8iP&O0c8(B5~B1WNq_)osdFqnAVX(joNG&7^=uF_m-<5oBv z?m%B?-D{p0&CcYHYp1!t=zkNxZfh!NlAeAqsF4r|F2;oXZHrKkV`!u)0053cQoxsx z6p(uv7z6}?AlKsq0+A9zqI&7}>Dv-OpcoW@3^o!&iVA^UAwn`BYkMOJq}X2|A_F-U z5E=1b6#j{@eRJKf9*`0CyhM%+iHbJ*nGyS629A{ds|PG2i6fCiND*p3TahYo2^12E zH8Mq^jId~oCtSh=y^qE}@&7mp1*q{)8TOw9m;#gnASu8DAPNu&D0acGnc+5v^2$d` z;qjQ>j-tS~uu5RkVyEx68Km^A*0XxdRGI@7NFwLuqzv z+&@=!W9Me_(6P?7G@8LM!6R{Iz}%dm2^GQ=Pkd~A0|Em9zz6C`RiyI%DwQQ6harbb z?WaSu5*D4XZt-iQ2{p?Uo4oOVinxDE`yv7XvS)J)+$^In7nXGObk*Y#D)v|FAZEFf zl|ALs?*nyGggeBHx8IdPJ`3H9maNKWZWnP*mSFj)CotBL<=?I4AUVfV$Ztl>aZ+>g~Z^rS{qF3ZQmH7xnwM>0Mrf1`9_dZfLbzqZ|peF!hFDX;2X}+yPG_t wOwBKVf7!En^sPVj@+DyUA$RKFy8p3=6^*i-q^vgLr)Ro0{)or2xAoQj13I$j+5i9m literal 0 HcmV?d00001 diff --git a/app/build.gradle b/app/build.gradle index a93790f..2a084ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,16 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' +// Create a variable called keystorePropertiesFile, and initialize it to your +// keystore.properties file, in the rootProject folder. +def keystorePropertiesFile = rootProject.file("keystore.properties") + +// Initialize a new Properties() object called keystoreProperties. +def keystoreProperties = new Properties() + +// Load your keystore.properties file into the keystoreProperties object. +keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + android { compileSdkVersion 32 @@ -13,12 +23,20 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - + signingConfigs { + create("release") { + keyAlias = keystoreProperties["keyAlias"] + keyPassword = keystoreProperties["keyPassword"] + storeFile = file(keystoreProperties["storeFile"]) + storePassword = keystoreProperties["storePassword"] + } + } buildTypes { release { minifyEnabled true shrinkResources true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig = signingConfigs.getByName("release") } } From c895c08924b36a6c492314328cdd2dfd716c4aae Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 10 Dec 2022 07:57:25 +0100 Subject: [PATCH 10/15] Fix file generation --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index fdae655..accbd7e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,10 +16,10 @@ steps: path: /tmp/deploy commands: - touch keystore.properties - - storePassword=$STOREPASSWORD >> keystore.properties - - keyPassword=$KEYPASSWORD >> keystore.properties - - keyAlias=key0 >> keystore.properties - - storeFile=../AndroidKey >> keystore.properties + - echo "storePassword=$STOREPASSWORD" >> keystore.properties + - echo "keyPassword=$KEYPASSWORD" >> keystore.properties + - echo "keyAlias=key0" >> keystore.properties + - echo "storeFile=../AndroidKey" >> keystore.properties - ./gradlew test - ./gradlew assembleDebug - ./gradlew bundleRelease From bc44dfd38685e498bca86a41b014a7971384a1d0 Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 10 Dec 2022 08:06:52 +0100 Subject: [PATCH 11/15] Add -p option to mkdir to fix error --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index accbd7e..3ababcf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ steps: - ./gradlew test - ./gradlew assembleDebug - ./gradlew bundleRelease - - mkdir /tmp/deploy/lastBuild + - mkdir -p /tmp/deploy/lastBuild - cp ./app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/app-debug.apk - cp ./app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/app-release.aab From 9986fd7565dc40f6fd8162dc997e49b20f28c3aa Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 10 Dec 2022 08:24:15 +0100 Subject: [PATCH 12/15] Extract deploy step --- .drone.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3ababcf..56fb5f9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,9 +23,17 @@ steps: - ./gradlew test - ./gradlew assembleDebug - ./gradlew bundleRelease + +- name: deployLatestBuild + image: busybox + volumes: + - name: deploy + path: /tmp/deploy + commands: - mkdir -p /tmp/deploy/lastBuild - cp ./app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/app-debug.apk - - cp ./app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/app-release.aab + - cp ./app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/app-release.aab- cp ./app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/app-debug.apk + - cp ./app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/app-release.aab volumes: - name: deploy From 5447c47d619d1e638cf7f1469e4eec06a9edd142 Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 10 Dec 2022 08:42:37 +0100 Subject: [PATCH 13/15] Fix copy paste mistake --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 56fb5f9..06cca5b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,7 +32,6 @@ steps: commands: - mkdir -p /tmp/deploy/lastBuild - cp ./app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/app-debug.apk - - cp ./app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/app-release.aab- cp ./app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/app-debug.apk - cp ./app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/app-release.aab volumes: From fa24e254dc4c1e3d0368b3639e063e48d314d764 Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 10 Dec 2022 08:57:54 +0100 Subject: [PATCH 14/15] Extract prepare signing step --- .drone.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 06cca5b..2ae49df 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,22 +4,23 @@ type: docker name: Android steps: -- name: build - image: mingc/android-build-box +- name: prepareSigning + image: busybox environment: STOREPASSWORD: from_secret: StorePassword KEYPASSWORD: from_secret: KeyPassword - volumes: - - name: deploy - path: /tmp/deploy commands: - touch keystore.properties - echo "storePassword=$STOREPASSWORD" >> keystore.properties - echo "keyPassword=$KEYPASSWORD" >> keystore.properties - echo "keyAlias=key0" >> keystore.properties - echo "storeFile=../AndroidKey" >> keystore.properties + +- name: build + image: mingc/android-build-box + commands: - ./gradlew test - ./gradlew assembleDebug - ./gradlew bundleRelease From 5ec74da139e2407338b148941fc3a921765eb404 Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 10 Dec 2022 09:11:12 +0100 Subject: [PATCH 15/15] Add slack notification --- .drone.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2ae49df..3d470aa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ type: docker name: Android steps: -- name: prepareSigning +- name: prepare signing image: busybox environment: STOREPASSWORD: @@ -25,7 +25,7 @@ steps: - ./gradlew assembleDebug - ./gradlew bundleRelease -- name: deployLatestBuild +- name: deploy laatest buuild image: busybox volumes: - name: deploy @@ -35,6 +35,12 @@ steps: - cp ./app/build/outputs/apk/debug/app-debug.apk /tmp/deploy/lastBuild/app-debug.apk - cp ./app/build/outputs/bundle/release/app-release.aab /tmp/deploy/lastBuild/app-release.aab +- name: slack notification + image: plugins/slack + settings: + webhook: + from_secret: SlackWebhook + volumes: - name: deploy host: