From 9bd0883f12d4b6b53db60ab6f57bb761c4b22df8 Mon Sep 17 00:00:00 2001 From: javavirys Date: Tue, 17 Aug 2021 17:23:45 +0300 Subject: [PATCH 01/76] mp-#58 Setup CI\CD --- app/.gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/.gitignore b/app/.gitignore index 42afabf..73b491a 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,3 @@ -/build \ No newline at end of file +/build +*.aab +/release/* \ No newline at end of file From e3fc9a2d4d6e94e5fde91141d0d5be05bba1c896 Mon Sep 17 00:00:00 2001 From: javavirys Date: Tue, 17 Aug 2021 17:52:43 +0300 Subject: [PATCH 02/76] mp-#58 Setup CI\CD --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index aa724b7..073bf60 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ .externalNativeBuild .cxx local.properties +keystore.properties From c79082e799e3194b3eb25f6243826458175876cd Mon Sep 17 00:00:00 2001 From: javavirys Date: Wed, 18 Aug 2021 17:43:50 +0300 Subject: [PATCH 03/76] mp-#58 Setup CI\CD --- .github/workflows/actions.yml | 26 +++++++++++++++++++ app/build.gradle | 14 ++++++++++ .../src/main/java/gradleutils/Keystore.kt | 23 ++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 .github/workflows/actions.yml create mode 100644 buildSrc/src/main/java/gradleutils/Keystore.kt diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml new file mode 100644 index 0000000..7160cd6 --- /dev/null +++ b/.github/workflows/actions.yml @@ -0,0 +1,26 @@ +name: 'Android application builder' +on: push +jobs: + check: + runs-on: ubuntu-latest + container: + image: javavirys/android:30.0.3 + steps: + - name: Checkout repository + - uses: actions/checkout@master + +# -job: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@master +# - name: Publish to Registry +# uses: elgohr/Publish-Docker-Github-Action@master +# env: +# android_compile_sdk: 30 +# android_build_tools: 30.0.3 +# android_sdk_tools: 4333796 +# with: +# name: javavirys/android:${{ env.android_build_tools }} +# username: ${{ secrets.DOCKER_USERNAME }} +# password: ${{ secrets.DOCKER_PASSWORD }} +# buildargs: android_compile_sdk,android_build_tools,android_sdk_tools \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index fd6b396..74fe8ab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,5 @@ +import gradleutils.Keystore + plugins { id 'com.android.application' id 'kotlin-android' @@ -8,6 +10,8 @@ plugins { id 'com.google.firebase.crashlytics' } +def keystore = new Keystore(rootProject) + android { compileSdkVersion 30 buildToolsVersion "30.0.3" @@ -29,8 +33,18 @@ android { } + signingConfigs { + release { + keyAlias keystore.getProperty('keyAlias') + keyPassword keystore.getProperty('keyPassword') + storeFile file(keystore.getProperty('storeFile')) + storePassword keystore.getProperty('storePassword') + } + } + buildTypes { release { + signingConfig signingConfigs.release minifyEnabled true shrinkResources true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' diff --git a/buildSrc/src/main/java/gradleutils/Keystore.kt b/buildSrc/src/main/java/gradleutils/Keystore.kt new file mode 100644 index 0000000..0dc1341 --- /dev/null +++ b/buildSrc/src/main/java/gradleutils/Keystore.kt @@ -0,0 +1,23 @@ +package gradleutils; + +import org.gradle.api.Project +import java.io.FileInputStream +import java.util.* + +class Keystore(rootProject: Project) { + + private val keystoreProperties = Properties() + + init { + val keystoreFile = rootProject.file("keystore.properties") + if (keystoreFile.exists()) { + keystoreProperties.load(FileInputStream(keystoreFile)) + } + } + + fun getProperty(key: String): String = when { + keystoreProperties.containsKey(key) -> keystoreProperties[key] as String + System.getenv(key) != null -> System.getenv(key) + else -> throw RuntimeException("Property not found!") + } +} \ No newline at end of file From 083ecdb49de2d9911d224664231b7877e1e0f402 Mon Sep 17 00:00:00 2001 From: javavirys Date: Wed, 18 Aug 2021 17:48:22 +0300 Subject: [PATCH 04/76] Update actions.yml --- .github/workflows/actions.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 7160cd6..7ce145d 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -7,20 +7,4 @@ jobs: image: javavirys/android:30.0.3 steps: - name: Checkout repository - - uses: actions/checkout@master - -# -job: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@master -# - name: Publish to Registry -# uses: elgohr/Publish-Docker-Github-Action@master -# env: -# android_compile_sdk: 30 -# android_build_tools: 30.0.3 -# android_sdk_tools: 4333796 -# with: -# name: javavirys/android:${{ env.android_build_tools }} -# username: ${{ secrets.DOCKER_USERNAME }} -# password: ${{ secrets.DOCKER_PASSWORD }} -# buildargs: android_compile_sdk,android_build_tools,android_sdk_tools \ No newline at end of file + - uses: actions/checkout@v1 From 69ac5ef60b698e179a34f43d497da587a63858cd Mon Sep 17 00:00:00 2001 From: javavirys Date: Wed, 18 Aug 2021 17:49:44 +0300 Subject: [PATCH 05/76] Update actions.yml --- .github/workflows/actions.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 7ce145d..6c9f096 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -6,5 +6,4 @@ jobs: container: image: javavirys/android:30.0.3 steps: - - name: Checkout repository - uses: actions/checkout@v1 From c51274e90a6cab3d564768da868ae8cb1230ae9b Mon Sep 17 00:00:00 2001 From: javavirys Date: Wed, 18 Aug 2021 17:51:05 +0300 Subject: [PATCH 06/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 6c9f096..7c71076 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -6,4 +6,4 @@ jobs: container: image: javavirys/android:30.0.3 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 From 8e0bb102e94efe41ef9b08e4a3feb016f824c32f Mon Sep 17 00:00:00 2001 From: javavirys Date: Wed, 18 Aug 2021 17:53:10 +0300 Subject: [PATCH 07/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 7c71076..8f97cad 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -4,6 +4,6 @@ jobs: check: runs-on: ubuntu-latest container: - image: javavirys/android:30.0.3 + image: javavirys/android:30.0.4 steps: - uses: actions/checkout@v2 From a83f98d26a7cd6c0a072270b92b4c15fbe4237c2 Mon Sep 17 00:00:00 2001 From: javavirys Date: Wed, 18 Aug 2021 17:53:57 +0300 Subject: [PATCH 08/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 8f97cad..7c71076 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -4,6 +4,6 @@ jobs: check: runs-on: ubuntu-latest container: - image: javavirys/android:30.0.4 + image: javavirys/android:30.0.3 steps: - uses: actions/checkout@v2 From 32c99289e31b024a411088be84ab15223fd6bdd3 Mon Sep 17 00:00:00 2001 From: javavirys Date: Wed, 18 Aug 2021 22:11:11 +0300 Subject: [PATCH 09/76] Update actions.yml --- .github/workflows/actions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 7c71076..95fed22 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -7,3 +7,4 @@ jobs: image: javavirys/android:30.0.3 steps: - uses: actions/checkout@v2 + - run: ls From 2cd3b3b5a11d4c49c9362ee8b0a915ceccef3bfa Mon Sep 17 00:00:00 2001 From: javavirys Date: Wed, 18 Aug 2021 22:14:41 +0300 Subject: [PATCH 10/76] Update actions.yml --- .github/workflows/actions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 95fed22..07931c9 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -8,3 +8,4 @@ jobs: steps: - uses: actions/checkout@v2 - run: ls + - run: ./gradlew lints From 773c535d4507fcc5f9465904c76dbc6a8a92cc3e Mon Sep 17 00:00:00 2001 From: javavirys Date: Wed, 18 Aug 2021 22:16:56 +0300 Subject: [PATCH 11/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 07931c9..94ca84d 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -8,4 +8,4 @@ jobs: steps: - uses: actions/checkout@v2 - run: ls - - run: ./gradlew lints + - run: ./gradlew lint From ee75a0e1fed502611f04a227528bba5e3800905d Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 11:04:26 +0300 Subject: [PATCH 12/76] Update actions.yml --- .github/workflows/actions.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 94ca84d..cbaa87a 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -7,5 +7,10 @@ jobs: image: javavirys/android:30.0.3 steps: - uses: actions/checkout@v2 - - run: ls - - run: ./gradlew lint + - name: Run lint + run: ./gradlew lint + env: + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + STORE_FILE: ${{ secrets.STORE_FILE }} + STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} From 9a5698fe0313616fe9a98f730f14a688cca061ca Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 11:09:20 +0300 Subject: [PATCH 13/76] Update build.gradle --- app/build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 74fe8ab..2642857 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,10 +35,10 @@ android { signingConfigs { release { - keyAlias keystore.getProperty('keyAlias') - keyPassword keystore.getProperty('keyPassword') - storeFile file(keystore.getProperty('storeFile')) - storePassword keystore.getProperty('storePassword') + keyAlias keystore.getProperty('KEY_ALIAS') + keyPassword keystore.getProperty('KEY_PASSWORD') + storeFile file(keystore.getProperty('STORE_FILE')) + storePassword keystore.getProperty('STORE_PASSWORD') } } @@ -103,4 +103,4 @@ dependencies { //di implementation Dependencies.koin implementation Dependencies.koinExt -} \ No newline at end of file +} From 04dfb0d46016ef733a5d742b47a182aedd11248b Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 11:30:05 +0300 Subject: [PATCH 14/76] Update actions.yml --- .github/workflows/actions.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index cbaa87a..1a6fc2c 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -14,3 +14,29 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + buildApks: + runs-on: ubuntu-latest + container: + image: javavirys/android:30.0.3 + steps: + - uses: actions/checkout@v2 + - name: Build apks + run: ./gradlew build + env: + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + STORE_FILE: ${{ secrets.STORE_FILE }} + STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + buildBundles: + runs-on: ubuntu-latest + container: + image: javavirys/android:30.0.3 + steps: + - uses: actions/checkout@v2 + - name: Build bundles + run: ./gradlew bundle + env: + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + STORE_FILE: ${{ secrets.STORE_FILE }} + STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} From 1304f1d1a3933b384e94a05d8df787e489139b6d Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 12:03:48 +0300 Subject: [PATCH 15/76] Update actions.yml --- .github/workflows/actions.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 1a6fc2c..cf6e8a6 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -1,6 +1,7 @@ name: 'Android application builder' on: push jobs: + check: runs-on: ubuntu-latest container: @@ -14,12 +15,14 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + buildApks: runs-on: ubuntu-latest container: image: javavirys/android:30.0.3 steps: - uses: actions/checkout@v2 + - name: Build apks run: ./gradlew build env: @@ -27,6 +30,7 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + buildBundles: runs-on: ubuntu-latest container: From 4076a7629736921809e4dbeec1ffc604ffc1cc9c Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 12:06:02 +0300 Subject: [PATCH 16/76] Add files via upload --- MediaPlayerKeystore.jks | Bin 0 -> 2465 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 MediaPlayerKeystore.jks diff --git a/MediaPlayerKeystore.jks b/MediaPlayerKeystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..91a092e4405a95155e484b11a8bc0dbce2693664 GIT binary patch literal 2465 zcmY+Ec{~(~7RP7I48}S|mLeldVakkMLZZvuvJ7L0NHQ4vG6o@I82gfB8^x5wMcK*v zFl0$2lBKd{kKx+a=e^H+_kQjl=W{-v@9&)R-}xdb(B~{b5RwALu|j1d4I;O>fowoJ z1*#9GKy^>BHj)By{YM133#LFUPcZhROjtSpx5dQ)WT8{Q`$!6S8!5xe@qc`B{2ZA7 z%;~viXC!JOUi+T+cQou%IJCEt1q5K2fGOb4gkb@^6|RTzHmItqKbZM_syoMWJmJ%m zjEEG$DngBA9avaG%Awf-5I~Wji+AH7XlnPdy-}XF@b> z-lz*{oBFSieH^R7xqU-bK$%8AOY@ zNTLbK3`@_oU+V$z+BwpJ#)v_HNxDxg`4$%pD{EPgZzhA4{Y4U?4Q1 zM*oiVdW!j@+RN@^4cvwxR_+Bgkv~~}>-`lob0pW>VD*x1hP&~;i(EzwZmKM8xBa?^ zkTugVA!`<^$hiO3PgWP?_=f7sJWMBJlhT)5DB_8Gc^hBuXtovy0x zNGpgac+=j?eiLpWThuGej0LiO&L`NYN=GKZg2Cr#c|;c#_J>ZF=T8HG{6;^8h0{O#(ZQXBf0k#FHZ zu6`Y#C}&-=-k%fBQyC_C1!JEqgGRw7*3B2(FUrjmT{k3560auaQh7F% zjla5GY!TUCu^CWGA1!(pW5ofm^gBd!;L|qQ;sp-YVw!FS)tOb)xwlSVlfde*_qA_X z2_CjbU-~i`{p#*5kepnIh}l;zH@=#7`n!u8eTSF$%R)n|3nTmVQ=&iI4DEVwm1Jp! zay<*)I&!S=z5>$6VEMs7_`ESF-o`YZe09 zF^NK9HpY5u7FfWsiD*r z6_6BA&tF4qtaJ*f@dVYf00Aeh{O<(#5680p$FX!bXxZpzPq5M}(4^3!PKq!5NbkRn zB~w5F!2$d25aZaS*)-xE;ZSpIR@tuj=W$|(Cv?=O=SnLx&f+2`@bVo+QTKrlin`W* zoldz!hhP%87^#M)@ z?CBrJKi?~5D-Il>qmAlL)w=ObDvbkns{FD!gGBM23HS)+<`VH-ytZVW};#nGhBUN&`E`E-uf$0chE{X z#6xwAt z!8Sm&QA_Pgc$BvKU_=^DPQ&n{*fQ(?O;Xe~s2I)9g8dItIAmtFGr zFmHNlL4W0w`-=1kNesMDOfg3@vw`|5Z^_-2V8g>xa(2p|UB6+bbKU~|D@brd0fZ~w z@fxH3_^=4>5;sZBJRnuKf(mTj=fSU4HJPa{X>M@_b$t1=x&AJ5mq@g@l~ z8S(*rsW<+Q*Bb(FKljF}HaB%vwdqKlGSnc(^>vGxl?fDf$B?gBTNT%94%)foZ6ne$mdDhrKHL=@ zmDsX5`xWx|fm28bTd!KV;hVhQ31Go+hAN4aYgdaRgXuQ{^e|fXS6W~sGj|Jw(!1)d z^Dk2CS&h}`TO&@#wHiIiym+$9YGTwi2hd>69vRT*#1qEjKCe*n@tae9`QW;kCBeoU z)tx(yA%gnsOL2rlSW02`_^S(iZlZ(1DL&b|`;opS`Ud=#{3%|sj;mV@8n)t}! zo>BRyNG+r|63PmZ;{mapg#f_(&;{JgWW9}~?fdTe3Go^BeHPngF#nE!et$FMrr5lr TbW!BAcq*py Date: Thu, 19 Aug 2021 12:24:13 +0300 Subject: [PATCH 17/76] Update actions.yml --- .github/workflows/actions.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index cf6e8a6..75cf52d 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -23,13 +23,15 @@ jobs: steps: - uses: actions/checkout@v2 + - run: ls + - name: Build apks run: ./gradlew build env: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} - STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + STORE_PASSWORD: /MediaPlayerKeystore.jks buildBundles: runs-on: ubuntu-latest From acea4a0e520b1d324a6b9137d0c34e207948a6ba Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 12:29:22 +0300 Subject: [PATCH 18/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 75cf52d..dda8f55 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -31,7 +31,7 @@ jobs: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} - STORE_PASSWORD: /MediaPlayerKeystore.jks + STORE_PASSWORD: /../MediaPlayerKeystore.jks buildBundles: runs-on: ubuntu-latest From fcb38be90abff370d4ef296b9b37930e50927a44 Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 12:36:17 +0300 Subject: [PATCH 19/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index dda8f55..da219d1 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -31,7 +31,7 @@ jobs: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} - STORE_PASSWORD: /../MediaPlayerKeystore.jks + STORE_PASSWORD: ../MediaPlayerKeystore.jks buildBundles: runs-on: ubuntu-latest From 0477ea10dd01ee64e6a6cc96098cb389c630c559 Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 15:50:41 +0300 Subject: [PATCH 20/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index da219d1..c4c11a4 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -31,7 +31,7 @@ jobs: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} - STORE_PASSWORD: ../MediaPlayerKeystore.jks + STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} buildBundles: runs-on: ubuntu-latest From ec605927c460b8df897d689aa163b1ed113eb4a1 Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 17:24:22 +0300 Subject: [PATCH 21/76] Update actions.yml --- .github/workflows/actions.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index c4c11a4..0ef1fea 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -23,8 +23,6 @@ jobs: steps: - uses: actions/checkout@v2 - - run: ls - - name: Build apks run: ./gradlew build env: @@ -32,7 +30,8 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - + - run: ls + buildBundles: runs-on: ubuntu-latest container: From 84c220035eb098754dee993d5da83ec8887a2c12 Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 17:32:17 +0300 Subject: [PATCH 22/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 0ef1fea..360acfa 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -30,7 +30,7 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - - run: ls + - run: ls build buildBundles: runs-on: ubuntu-latest From 097ac75df6c135812cb829d978fed5020bb208b9 Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 17:44:24 +0300 Subject: [PATCH 23/76] Update actions.yml --- .github/workflows/actions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 360acfa..ae26ba3 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -31,6 +31,7 @@ jobs: STORE_FILE: ${{ secrets.STORE_FILE }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - run: ls build + - run: ls app/build buildBundles: runs-on: ubuntu-latest From d8abb1a520ef6e3d05c1495b9f963514dc771538 Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 17:54:58 +0300 Subject: [PATCH 24/76] Update actions.yml --- .github/workflows/actions.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index ae26ba3..91c1477 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -30,8 +30,13 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - - run: ls build - - run: ls app/build + + - name: Archive artifacts + uses: actions/upload-artifact@v2 + with: + name: Apks + path: + app/build/outputs/apk buildBundles: runs-on: ubuntu-latest From de65794f8f7afe350c0f5278079716a1c3c58d0d Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 19:31:59 +0300 Subject: [PATCH 25/76] Update actions.yml --- .github/workflows/actions.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 91c1477..ba43ba7 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -51,3 +51,11 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + + - name: Archive artifacts + uses: actions/upload-artifact@v2 + with: + name: Bundles + path: + app/build/outputs/bundle + From 9e5ddb7f8c46eeb5961e4c4279274f80a6c78eb6 Mon Sep 17 00:00:00 2001 From: javavirys Date: Thu, 19 Aug 2021 22:54:51 +0300 Subject: [PATCH 26/76] Update actions.yml --- .github/workflows/actions.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index ba43ba7..4b615e4 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -16,6 +16,13 @@ jobs: STORE_FILE: ${{ secrets.STORE_FILE }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + - name: Archive artifacts + uses: actions/upload-artifact@v2 + with: + name: lint + path: + app/build/reports + buildApks: runs-on: ubuntu-latest container: From f89f242a766fe84ec9262de49a420c3e1ed1eeac Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 10:59:31 +0300 Subject: [PATCH 27/76] mp-#58 Setup CI\CD --- .github/workflows/actions.yml | 38 +++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 4b615e4..9e49b69 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -1,8 +1,22 @@ name: 'Android application builder' -on: push +on: push jobs: - check: + tests: + runs-on: ubuntu-latest + container: + image: javavirys/android:30.0.3 + steps: + - uses: actions/checkout@v2 + - name: Run tests + run: ./gradlew test + env: + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + STORE_FILE: ${{ secrets.STORE_FILE }} + STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + + lint: runs-on: ubuntu-latest container: image: javavirys/android:30.0.3 @@ -15,7 +29,7 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - + - name: Archive artifacts uses: actions/upload-artifact@v2 with: @@ -24,12 +38,13 @@ jobs: app/build/reports buildApks: + needs: [ lint, tests ] runs-on: ubuntu-latest container: image: javavirys/android:30.0.3 steps: - uses: actions/checkout@v2 - + - name: Build apks run: ./gradlew build env: @@ -37,7 +52,7 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - + - name: Archive artifacts uses: actions/upload-artifact@v2 with: @@ -46,6 +61,8 @@ jobs: app/build/outputs/apk buildBundles: + needs: [ lint, tests ] + if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest container: image: javavirys/android:30.0.3 @@ -58,7 +75,7 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - + - name: Archive artifacts uses: actions/upload-artifact@v2 with: @@ -66,3 +83,12 @@ jobs: path: app/build/outputs/bundle + publishToPlay: + needs: [ buildBundles ] + if: github.ref == 'refs/heads/main' + runs-on: ubuntu-latest + container: + image: javavirys/android:30.0.3 + steps: + - uses: actions/checkout@v2 + - run: echo Not Implemented yet! From a92ee672f941032f334bf5f1d29fb0e41f25d37c Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 11:05:37 +0300 Subject: [PATCH 28/76] mp-#58 Setup CI\CD --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 9e49b69..932b292 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -46,7 +46,7 @@ jobs: - uses: actions/checkout@v2 - name: Build apks - run: ./gradlew build + run: ./gradlew assemble env: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} From fd2b35b9b71bf77ebe798a53bf17aa9baa14b9bb Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 11:32:37 +0300 Subject: [PATCH 29/76] mp-#58 Setup CI\CD --- .github/workflows/actions.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 932b292..ba47782 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -2,6 +2,12 @@ name: 'Android application builder' on: push jobs: + copy_keystore: + runs-on: ubuntu-latest + steps: + - run: echo ${{ secrets.KEYSTORE }} > keystore.jks + - run: ls ~ + tests: runs-on: ubuntu-latest container: @@ -15,6 +21,7 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} STORE_FILE: ${{ secrets.STORE_FILE }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + KEYSTORE: ${{ secrets.KEYSTORE }} lint: runs-on: ubuntu-latest From f9db4f04ff2a3e3fb967966fd0adf2c64fafe1d4 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 11:34:28 +0300 Subject: [PATCH 30/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index ba47782..be8a2dd 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -5,7 +5,7 @@ jobs: copy_keystore: runs-on: ubuntu-latest steps: - - run: echo ${{ secrets.KEYSTORE }} > keystore.jks + - run: echo "${{ secrets.KEYSTORE }}" > keystore.jks - run: ls ~ tests: From 406acbe16a8910f5bc056456f5aee2e5b709a792 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 11:35:58 +0300 Subject: [PATCH 31/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index be8a2dd..9da6395 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -5,7 +5,7 @@ jobs: copy_keystore: runs-on: ubuntu-latest steps: - - run: echo "${{ secrets.KEYSTORE }}" > keystore.jks +# - run: echo "${{ secrets.KEYSTORE }}" > keystore.jks - run: ls ~ tests: From 13d7cb8d611978e3a5e1cf53800f3fd6329fd30d Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 11:42:54 +0300 Subject: [PATCH 32/76] Update actions.yml --- .github/workflows/actions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 9da6395..433b68c 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -7,6 +7,7 @@ jobs: steps: # - run: echo "${{ secrets.KEYSTORE }}" > keystore.jks - run: ls ~ + - run: git clone git@github.com:javavirys/MediaPlayerKeys.git tests: runs-on: ubuntu-latest From 8891be0364245349b38ab4d94c437ffaa8c46349 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 11:48:36 +0300 Subject: [PATCH 33/76] Update actions.yml --- .github/workflows/actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 433b68c..a7b19e3 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -6,8 +6,8 @@ jobs: runs-on: ubuntu-latest steps: # - run: echo "${{ secrets.KEYSTORE }}" > keystore.jks - - run: ls ~ - - run: git clone git@github.com:javavirys/MediaPlayerKeys.git +# - run: ls ~ + - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git tests: runs-on: ubuntu-latest From 0fb76e8b2c90c740d4d8f98a62932706cf29d9ff Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 11:59:15 +0300 Subject: [PATCH 34/76] Update actions.yml --- .github/workflows/actions.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index a7b19e3..f7b9dd1 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -5,8 +5,16 @@ jobs: copy_keystore: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2 # - run: echo "${{ secrets.KEYSTORE }}" > keystore.jks # - run: ls ~ + + # Add private key to ssh agent + - run: mkdir ~/.ssh; chmod 700 ~/.ssh + - run: echo "${{ secrets.PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa + - run: eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_rsa + - run: ssh-keyscan github.com >> ~/.ssh/known_hosts + - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git tests: From 727d95e0fb7ac00b90cad3c9ebfad204053e4dd9 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 12:07:46 +0300 Subject: [PATCH 35/76] Update actions.yml --- .github/workflows/actions.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index f7b9dd1..1f308dc 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -7,7 +7,6 @@ jobs: steps: - uses: actions/checkout@v2 # - run: echo "${{ secrets.KEYSTORE }}" > keystore.jks -# - run: ls ~ # Add private key to ssh agent - run: mkdir ~/.ssh; chmod 700 ~/.ssh From b524a1f10f202d59c196fa784464609e21ce5273 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 12:11:46 +0300 Subject: [PATCH 36/76] Update actions.yml --- .github/workflows/actions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 1f308dc..ac8d7e8 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -15,6 +15,7 @@ jobs: - run: ssh-keyscan github.com >> ~/.ssh/known_hosts - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git + - run: ls tests: runs-on: ubuntu-latest From d57f8fc60d353ea86b6759b8464070d8a84d4aed Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 12:25:00 +0300 Subject: [PATCH 37/76] Update actions.yml --- .github/workflows/actions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index ac8d7e8..d2af16e 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -16,6 +16,7 @@ jobs: - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git - run: ls + - run: find "$(pwd)" -name *.jks tests: runs-on: ubuntu-latest From 206e8e33a7cc60bd71113bdac6a28a49bfa98d9f Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 12:43:26 +0300 Subject: [PATCH 38/76] Update actions.yml --- .github/workflows/actions.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index d2af16e..96c4c8c 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -15,8 +15,9 @@ jobs: - run: ssh-keyscan github.com >> ~/.ssh/known_hosts - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git - - run: ls - - run: find "$(pwd)" -name *.jks + - run: mkdir ~/keystore + - run: ls ~ +# - run: find . -name '*.md' -exec cp "{}" /home/javavirys \; tests: runs-on: ubuntu-latest From 27536ad95fc2b24002b1bd2ed68e6a12a7f0c1b7 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 12:45:54 +0300 Subject: [PATCH 39/76] Update actions.yml --- .github/workflows/actions.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 96c4c8c..b3ed316 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -16,8 +16,10 @@ jobs: - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git - run: mkdir ~/keystore + - run: ls - run: ls ~ -# - run: find . -name '*.md' -exec cp "{}" /home/javavirys \; + - run: find . -name '*.jks' -exec cp "{}" ~/keystore/ \; + - run: ls ~/keystore tests: runs-on: ubuntu-latest From 0305696345c6caea831e9841e0ddddf1f21cd961 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 12:55:42 +0300 Subject: [PATCH 40/76] Update actions.yml --- .github/workflows/actions.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index b3ed316..f588670 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -6,7 +6,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 -# - run: echo "${{ secrets.KEYSTORE }}" > keystore.jks # Add private key to ssh agent - run: mkdir ~/.ssh; chmod 700 ~/.ssh @@ -14,18 +13,26 @@ jobs: - run: eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_rsa - run: ssh-keyscan github.com >> ~/.ssh/known_hosts + # Clone keystore repository - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git - run: mkdir ~/keystore - run: ls - run: ls ~ - run: find . -name '*.jks' -exec cp "{}" ~/keystore/ \; - run: ls ~/keystore + - name: Keystore caching + uses: actions/cache@v2 + with: + path: | + ~/keystore tests: + needs: [ copy_keystore ] runs-on: ubuntu-latest container: image: javavirys/android:30.0.3 steps: + - run: ls ~ - uses: actions/checkout@v2 - name: Run tests run: ./gradlew test @@ -37,6 +44,7 @@ jobs: KEYSTORE: ${{ secrets.KEYSTORE }} lint: + needs: [ copy_keystore ] runs-on: ubuntu-latest container: image: javavirys/android:30.0.3 From fc1271b68a3c23fc69c157f380d91d9829c26c42 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 13:36:26 +0300 Subject: [PATCH 41/76] Update actions.yml --- .github/workflows/actions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index f588670..0a6ef15 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -25,6 +25,7 @@ jobs: with: path: | ~/keystore + key: keystore tests: needs: [ copy_keystore ] From d8e1bd345e88ef72508daa4cc74aff1229b95082 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 13:41:15 +0300 Subject: [PATCH 42/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 0a6ef15..960a797 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -33,8 +33,8 @@ jobs: container: image: javavirys/android:30.0.3 steps: - - run: ls ~ - uses: actions/checkout@v2 + - run: ls ~ - name: Run tests run: ./gradlew test env: From 2fe1cb3137b10a306d90e57a22d2cac4285486de Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 14:15:42 +0300 Subject: [PATCH 43/76] Update actions.yml --- .github/workflows/actions.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 960a797..0f751ff 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -34,6 +34,13 @@ jobs: image: javavirys/android:30.0.3 steps: - uses: actions/checkout@v2 + + - uses: actions/cache@v2 + id: restore-build + with: + path: ./* + key: keystore + - run: ls ~ - name: Run tests run: ./gradlew test From b44e0a1024db1268277a714519370d70aa0e4de3 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 14:19:03 +0300 Subject: [PATCH 44/76] Update actions.yml --- .github/workflows/actions.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 0f751ff..90cdeee 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -25,7 +25,7 @@ jobs: with: path: | ~/keystore - key: keystore + key: ${{ github.sha }} tests: needs: [ copy_keystore ] @@ -38,8 +38,8 @@ jobs: - uses: actions/cache@v2 id: restore-build with: - path: ./* - key: keystore + path: ~/keystore + key: ${{ github.sha }} - run: ls ~ - name: Run tests From cad1b71c870bed5869c8602e0e70adfd0f6f6892 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 14:26:23 +0300 Subject: [PATCH 45/76] Update actions.yml --- .github/workflows/actions.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 90cdeee..5c2b087 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -38,7 +38,8 @@ jobs: - uses: actions/cache@v2 id: restore-build with: - path: ~/keystore + path: | + ~/keystore key: ${{ github.sha }} - run: ls ~ From 34b39631f3b0a013be4f93f0f81d8f84b7064c68 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 14:28:50 +0300 Subject: [PATCH 46/76] Update actions.yml --- .github/workflows/actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 5c2b087..18a962f 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -20,8 +20,8 @@ jobs: - run: ls ~ - run: find . -name '*.jks' -exec cp "{}" ~/keystore/ \; - run: ls ~/keystore - - name: Keystore caching - uses: actions/cache@v2 + - uses: actions/cache@v2 + id: restore-build with: path: | ~/keystore From 7fbd476533af516ea590fe248178cb319f6b230b Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 14:31:38 +0300 Subject: [PATCH 47/76] Update actions.yml --- .github/workflows/actions.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 18a962f..7f59a92 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -23,8 +23,7 @@ jobs: - uses: actions/cache@v2 id: restore-build with: - path: | - ~/keystore + path: ~/keystore key: ${{ github.sha }} tests: @@ -38,11 +37,11 @@ jobs: - uses: actions/cache@v2 id: restore-build with: - path: | - ~/keystore + path: ~/keystore key: ${{ github.sha }} - run: ls ~ + - run: ls - name: Run tests run: ./gradlew test env: From 117232cde83e9b1e40777f73de05457afca24704 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 14:35:15 +0300 Subject: [PATCH 48/76] Update actions.yml --- .github/workflows/actions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 7f59a92..512682e 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -4,6 +4,8 @@ jobs: copy_keystore: runs-on: ubuntu-latest + container: + image: javavirys/android:30.0.3 steps: - uses: actions/checkout@v2 From 5b6779a59733983f68496df2c3e721c7002d3805 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 14:39:33 +0300 Subject: [PATCH 49/76] Update actions.yml --- .github/workflows/actions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 512682e..e6bd64a 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -9,6 +9,8 @@ jobs: steps: - uses: actions/checkout@v2 + - run: apt install -y openssh-client + # Add private key to ssh agent - run: mkdir ~/.ssh; chmod 700 ~/.ssh - run: echo "${{ secrets.PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa From fab7bb0c0d0ec6ca3bc261f2da5c1def6ddd35f9 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 14:42:13 +0300 Subject: [PATCH 50/76] Update actions.yml --- .github/workflows/actions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index e6bd64a..8d929a1 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -10,6 +10,7 @@ jobs: - uses: actions/checkout@v2 - run: apt install -y openssh-client + - run: apt install -y git # Add private key to ssh agent - run: mkdir ~/.ssh; chmod 700 ~/.ssh From 002134a4b47be8a1465a81b382052c83f3af201e Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 14:44:51 +0300 Subject: [PATCH 51/76] Update actions.yml --- .github/workflows/actions.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 8d929a1..7f59a92 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -4,14 +4,9 @@ jobs: copy_keystore: runs-on: ubuntu-latest - container: - image: javavirys/android:30.0.3 steps: - uses: actions/checkout@v2 - - run: apt install -y openssh-client - - run: apt install -y git - # Add private key to ssh agent - run: mkdir ~/.ssh; chmod 700 ~/.ssh - run: echo "${{ secrets.PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa From 5abbf4eaafb21bcede9e0caf22a4b31e811b7602 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 14:50:52 +0300 Subject: [PATCH 52/76] Update actions.yml --- .github/workflows/actions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 7f59a92..dd7fea8 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -42,6 +42,7 @@ jobs: - run: ls ~ - run: ls + - run: ls / - name: Run tests run: ./gradlew test env: From 75fcc8a8432776f0d956207968aa5133abd926e4 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 14:56:56 +0300 Subject: [PATCH 53/76] Update actions.yml --- .github/workflows/actions.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index dd7fea8..3d53916 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -26,6 +26,20 @@ jobs: path: ~/keystore key: ${{ github.sha }} + copy_keystore1: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/cache@v2 + id: restore-build + with: + path: ~/keystore + key: ${{ github.sha }} + + - run: ls + - run: ls ~ + - run: ls ~/keystore + tests: needs: [ copy_keystore ] runs-on: ubuntu-latest From 529dfffc5e806ccc4d9c6e7c935dd4a61c0afe7c Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 14:58:07 +0300 Subject: [PATCH 54/76] Update actions.yml --- .github/workflows/actions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 3d53916..b5f9319 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -27,6 +27,7 @@ jobs: key: ${{ github.sha }} copy_keystore1: + needs: [ copy_keystore ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 6df76c403447664e71e6da9e732af01888c9c5b5 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 15:03:15 +0300 Subject: [PATCH 55/76] Update actions.yml --- .github/workflows/actions.yml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index b5f9319..6e1b788 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -27,8 +27,36 @@ jobs: key: ${{ github.sha }} copy_keystore1: - needs: [ copy_keystore ] runs-on: ubuntu-latest + container: + image: javavirys/android:30.0.3 + steps: + - uses: actions/checkout@v2 + + # Add private key to ssh agent + - run: mkdir ~/.ssh; chmod 700 ~/.ssh + - run: echo "${{ secrets.PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa + - run: eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_rsa + - run: ssh-keyscan github.com >> ~/.ssh/known_hosts + + # Clone keystore repository + - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git + - run: mkdir ~/keystore + - run: ls + - run: ls ~ + - run: find . -name '*.jks' -exec cp "{}" ~/keystore/ \; + - run: ls ~/keystore + - uses: actions/cache@v2 + id: restore-build + with: + path: ~/keystore + key: ${{ github.sha }} + + copy3: + needs: [ copy_keystore1 ] + runs-on: ubuntu-latest + container: + image: javavirys/android:30.0.3 steps: - uses: actions/checkout@v2 - uses: actions/cache@v2 From 22357a18672d8a4212fb85b1b9e069d74edf1f9b Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 15:50:04 +0300 Subject: [PATCH 56/76] Update actions.yml --- .github/workflows/actions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 6e1b788..4300aff 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -32,6 +32,8 @@ jobs: image: javavirys/android:30.0.3 steps: - uses: actions/checkout@v2 + - run: apt install -y openssh-client + - run: apt install -y git # Add private key to ssh agent - run: mkdir ~/.ssh; chmod 700 ~/.ssh From 7a21b47468489f0115c979f261a06b1dd39014b8 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 16:33:38 +0300 Subject: [PATCH 57/76] Update actions.yml --- .github/workflows/actions.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 4300aff..77c0aef 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -32,6 +32,7 @@ jobs: image: javavirys/android:30.0.3 steps: - uses: actions/checkout@v2 + - run: apt install -y openssh-client - run: apt install -y git @@ -42,11 +43,11 @@ jobs: - run: ssh-keyscan github.com >> ~/.ssh/known_hosts # Clone keystore repository - - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git +# - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git - run: mkdir ~/keystore - - run: ls - - run: ls ~ - - run: find . -name '*.jks' -exec cp "{}" ~/keystore/ \; +# - run: ls +# - run: ls ~ +# - run: find . -name '*.jks' -exec cp "{}" ~/keystore/ \; - run: ls ~/keystore - uses: actions/cache@v2 id: restore-build From 28c2fa444ce20638ff6ae05e5f137c330ba32fed Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 16:45:53 +0300 Subject: [PATCH 58/76] Update actions.yml --- .github/workflows/actions.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 77c0aef..d2af5b9 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -25,7 +25,7 @@ jobs: with: path: ~/keystore key: ${{ github.sha }} - +# Test ================================= copy_keystore1: runs-on: ubuntu-latest container: @@ -43,7 +43,7 @@ jobs: - run: ssh-keyscan github.com >> ~/.ssh/known_hosts # Clone keystore repository -# - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git + - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git - run: mkdir ~/keystore # - run: ls # - run: ls ~ @@ -72,6 +72,8 @@ jobs: - run: ls ~ - run: ls ~/keystore + # Test ================================= + tests: needs: [ copy_keystore ] runs-on: ubuntu-latest From 577d1a846fdfe82084edb4ca00c5138fc7042cd7 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 16:50:02 +0300 Subject: [PATCH 59/76] Update actions.yml --- .github/workflows/actions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index d2af5b9..46da095 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -40,8 +40,10 @@ jobs: - run: mkdir ~/.ssh; chmod 700 ~/.ssh - run: echo "${{ secrets.PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa - run: eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_rsa + - run: ssh-keygen -R github.com - run: ssh-keyscan github.com >> ~/.ssh/known_hosts + # Clone keystore repository - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git - run: mkdir ~/keystore From 26a220a38d7a9695efac2e0b064454aa6c65c7f1 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 16:56:22 +0300 Subject: [PATCH 60/76] Update actions.yml --- .github/workflows/actions.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 46da095..106e6bd 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -7,6 +7,8 @@ jobs: steps: - uses: actions/checkout@v2 + - run: env + # Add private key to ssh agent - run: mkdir ~/.ssh; chmod 700 ~/.ssh - run: echo "${{ secrets.PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa @@ -33,6 +35,8 @@ jobs: steps: - uses: actions/checkout@v2 + - run: env + - run: apt install -y openssh-client - run: apt install -y git From 4e1415f038340da31ec7768a3ccba0a8cd4fabe1 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 17:07:09 +0300 Subject: [PATCH 61/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 106e6bd..23d6c7a 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -37,7 +37,7 @@ jobs: - run: env - - run: apt install -y openssh-client +# - run: apt install -y openssh-client - run: apt install -y git # Add private key to ssh agent From 2895fef400d77d99e2aa1af96cef4efeccc6b06b Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 17:10:52 +0300 Subject: [PATCH 62/76] Update actions.yml --- .github/workflows/actions.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 23d6c7a..668cfd8 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -44,7 +44,6 @@ jobs: - run: mkdir ~/.ssh; chmod 700 ~/.ssh - run: echo "${{ secrets.PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa - run: eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_rsa - - run: ssh-keygen -R github.com - run: ssh-keyscan github.com >> ~/.ssh/known_hosts From 980e8348de12e8a557fed4702276c064414fd91f Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 17:51:14 +0300 Subject: [PATCH 63/76] Update actions.yml --- .github/workflows/actions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 668cfd8..b196829 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -46,6 +46,7 @@ jobs: - run: eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_rsa - run: ssh-keyscan github.com >> ~/.ssh/known_hosts + - run: ls -a ~/.ssh # Clone keystore repository - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git From 0a0a0a2c27b8f27966551a780ebf1c3a7278f65e Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 17:55:01 +0300 Subject: [PATCH 64/76] Update actions.yml --- .github/workflows/actions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index b196829..5fe559a 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -37,6 +37,8 @@ jobs: - run: env + - run: ls ~ -a + # - run: apt install -y openssh-client - run: apt install -y git From 832b2d18eb0472b5d3c9ecc94e0fc071a67708d0 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 17:59:26 +0300 Subject: [PATCH 65/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 5fe559a..5ee0afe 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -37,7 +37,7 @@ jobs: - run: env - - run: ls ~ -a + - run: ls / -a # - run: apt install -y openssh-client - run: apt install -y git From 4cd2c7200d66e403fdb0b9aa5da690664ba8eeed Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 21:03:33 +0300 Subject: [PATCH 66/76] Update actions.yml --- .github/workflows/actions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 5ee0afe..be0f2bb 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -48,6 +48,7 @@ jobs: - run: eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_rsa - run: ssh-keyscan github.com >> ~/.ssh/known_hosts + - run: echo ~ - run: ls -a ~/.ssh # Clone keystore repository From 3ea2804f5d49b4d637f56485edc44423fb4dbcbb Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 21:10:39 +0300 Subject: [PATCH 67/76] Update actions.yml --- .github/workflows/actions.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index be0f2bb..d6b2754 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -43,13 +43,13 @@ jobs: - run: apt install -y git # Add private key to ssh agent - - run: mkdir ~/.ssh; chmod 700 ~/.ssh - - run: echo "${{ secrets.PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa - - run: eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_rsa - - run: ssh-keyscan github.com >> ~/.ssh/known_hosts + - run: mkdir /root/.ssh; chmod 700 /root/.ssh + - run: echo "${{ secrets.PRIVATE_KEY }}" > /root/.ssh/id_rsa && chmod 600 root/.ssh/id_rsa + - run: eval "$(ssh-agent -s)" && ssh-add /root/.ssh/id_rsa + - run: ssh-keyscan github.com >> root/.ssh/known_hosts - run: echo ~ - - run: ls -a ~/.ssh + - run: ls -a /root/.ssh # Clone keystore repository - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git From ac8fedc3dfdb0077cd05ce05bb64fbcc6c39c52a Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 21:13:06 +0300 Subject: [PATCH 68/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index d6b2754..2ac4013 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -46,7 +46,7 @@ jobs: - run: mkdir /root/.ssh; chmod 700 /root/.ssh - run: echo "${{ secrets.PRIVATE_KEY }}" > /root/.ssh/id_rsa && chmod 600 root/.ssh/id_rsa - run: eval "$(ssh-agent -s)" && ssh-add /root/.ssh/id_rsa - - run: ssh-keyscan github.com >> root/.ssh/known_hosts + - run: ssh-keyscan github.com >> /root/.ssh/known_hosts - run: echo ~ - run: ls -a /root/.ssh From 3576db6a2584f8960c5ddd20cd4e955787e19253 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 21:15:24 +0300 Subject: [PATCH 69/76] Update actions.yml --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 2ac4013..7849999 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -44,7 +44,7 @@ jobs: # Add private key to ssh agent - run: mkdir /root/.ssh; chmod 700 /root/.ssh - - run: echo "${{ secrets.PRIVATE_KEY }}" > /root/.ssh/id_rsa && chmod 600 root/.ssh/id_rsa + - run: echo "${{ secrets.PRIVATE_KEY }}" > /root/.ssh/id_rsa && chmod 600 /root/.ssh/id_rsa - run: eval "$(ssh-agent -s)" && ssh-add /root/.ssh/id_rsa - run: ssh-keyscan github.com >> /root/.ssh/known_hosts From ddef8b87b23e41c880ec4612f98182fea25d6d59 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 21:22:42 +0300 Subject: [PATCH 70/76] Update actions.yml --- .github/workflows/actions.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 7849999..b062e7c 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -54,9 +54,7 @@ jobs: # Clone keystore repository - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git - run: mkdir ~/keystore -# - run: ls -# - run: ls ~ -# - run: find . -name '*.jks' -exec cp "{}" ~/keystore/ \; + - run: find . -name '*.jks' -exec cp "{}" ~/keystore/ \; - run: ls ~/keystore - uses: actions/cache@v2 id: restore-build From 5c224d4c01fa46eced4c35a1f82fe71f86d8aee1 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 21:30:35 +0300 Subject: [PATCH 71/76] Delete MediaPlayerKeystore.jks --- MediaPlayerKeystore.jks | Bin 2465 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 MediaPlayerKeystore.jks diff --git a/MediaPlayerKeystore.jks b/MediaPlayerKeystore.jks deleted file mode 100644 index 91a092e4405a95155e484b11a8bc0dbce2693664..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2465 zcmY+Ec{~(~7RP7I48}S|mLeldVakkMLZZvuvJ7L0NHQ4vG6o@I82gfB8^x5wMcK*v zFl0$2lBKd{kKx+a=e^H+_kQjl=W{-v@9&)R-}xdb(B~{b5RwALu|j1d4I;O>fowoJ z1*#9GKy^>BHj)By{YM133#LFUPcZhROjtSpx5dQ)WT8{Q`$!6S8!5xe@qc`B{2ZA7 z%;~viXC!JOUi+T+cQou%IJCEt1q5K2fGOb4gkb@^6|RTzHmItqKbZM_syoMWJmJ%m zjEEG$DngBA9avaG%Awf-5I~Wji+AH7XlnPdy-}XF@b> z-lz*{oBFSieH^R7xqU-bK$%8AOY@ zNTLbK3`@_oU+V$z+BwpJ#)v_HNxDxg`4$%pD{EPgZzhA4{Y4U?4Q1 zM*oiVdW!j@+RN@^4cvwxR_+Bgkv~~}>-`lob0pW>VD*x1hP&~;i(EzwZmKM8xBa?^ zkTugVA!`<^$hiO3PgWP?_=f7sJWMBJlhT)5DB_8Gc^hBuXtovy0x zNGpgac+=j?eiLpWThuGej0LiO&L`NYN=GKZg2Cr#c|;c#_J>ZF=T8HG{6;^8h0{O#(ZQXBf0k#FHZ zu6`Y#C}&-=-k%fBQyC_C1!JEqgGRw7*3B2(FUrjmT{k3560auaQh7F% zjla5GY!TUCu^CWGA1!(pW5ofm^gBd!;L|qQ;sp-YVw!FS)tOb)xwlSVlfde*_qA_X z2_CjbU-~i`{p#*5kepnIh}l;zH@=#7`n!u8eTSF$%R)n|3nTmVQ=&iI4DEVwm1Jp! zay<*)I&!S=z5>$6VEMs7_`ESF-o`YZe09 zF^NK9HpY5u7FfWsiD*r z6_6BA&tF4qtaJ*f@dVYf00Aeh{O<(#5680p$FX!bXxZpzPq5M}(4^3!PKq!5NbkRn zB~w5F!2$d25aZaS*)-xE;ZSpIR@tuj=W$|(Cv?=O=SnLx&f+2`@bVo+QTKrlin`W* zoldz!hhP%87^#M)@ z?CBrJKi?~5D-Il>qmAlL)w=ObDvbkns{FD!gGBM23HS)+<`VH-ytZVW};#nGhBUN&`E`E-uf$0chE{X z#6xwAt z!8Sm&QA_Pgc$BvKU_=^DPQ&n{*fQ(?O;Xe~s2I)9g8dItIAmtFGr zFmHNlL4W0w`-=1kNesMDOfg3@vw`|5Z^_-2V8g>xa(2p|UB6+bbKU~|D@brd0fZ~w z@fxH3_^=4>5;sZBJRnuKf(mTj=fSU4HJPa{X>M@_b$t1=x&AJ5mq@g@l~ z8S(*rsW<+Q*Bb(FKljF}HaB%vwdqKlGSnc(^>vGxl?fDf$B?gBTNT%94%)foZ6ne$mdDhrKHL=@ zmDsX5`xWx|fm28bTd!KV;hVhQ31Go+hAN4aYgdaRgXuQ{^e|fXS6W~sGj|Jw(!1)d z^Dk2CS&h}`TO&@#wHiIiym+$9YGTwi2hd>69vRT*#1qEjKCe*n@tae9`QW;kCBeoU z)tx(yA%gnsOL2rlSW02`_^S(iZlZ(1DL&b|`;opS`Ud=#{3%|sj;mV@8n)t}! zo>BRyNG+r|63PmZ;{mapg#f_(&;{JgWW9}~?fdTe3Go^BeHPngF#nE!et$FMrr5lr TbW!BAcq*py Date: Fri, 20 Aug 2021 21:31:21 +0300 Subject: [PATCH 72/76] Update actions.yml --- .github/workflows/actions.yml | 68 +++++++++++++---------------------- 1 file changed, 25 insertions(+), 43 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index b062e7c..3f4896c 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -2,33 +2,33 @@ name: 'Android application builder' on: push jobs: - copy_keystore: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 +# copy_keystore: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2 - - run: env +# - run: env - # Add private key to ssh agent - - run: mkdir ~/.ssh; chmod 700 ~/.ssh - - run: echo "${{ secrets.PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa - - run: eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_rsa - - run: ssh-keyscan github.com >> ~/.ssh/known_hosts +# # Add private key to ssh agent +# - run: mkdir ~/.ssh; chmod 700 ~/.ssh +# - run: echo "${{ secrets.PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa +# - run: eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_rsa +# - run: ssh-keyscan github.com >> ~/.ssh/known_hosts - # Clone keystore repository - - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git - - run: mkdir ~/keystore - - run: ls - - run: ls ~ - - run: find . -name '*.jks' -exec cp "{}" ~/keystore/ \; - - run: ls ~/keystore - - uses: actions/cache@v2 - id: restore-build - with: - path: ~/keystore - key: ${{ github.sha }} +# # Clone keystore repository +# - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git +# - run: mkdir ~/keystore +# - run: ls +# - run: ls ~ +# - run: find . -name '*.jks' -exec cp "{}" ~/keystore/ \; +# - run: ls ~/keystore +# - uses: actions/cache@v2 +# id: restore-build +# with: +# path: ~/keystore +# key: ${{ github.sha }} # Test ================================= - copy_keystore1: + copy_keystore: runs-on: ubuntu-latest container: image: javavirys/android:30.0.3 @@ -61,23 +61,6 @@ jobs: with: path: ~/keystore key: ${{ github.sha }} - - copy3: - needs: [ copy_keystore1 ] - runs-on: ubuntu-latest - container: - image: javavirys/android:30.0.3 - steps: - - uses: actions/checkout@v2 - - uses: actions/cache@v2 - id: restore-build - with: - path: ~/keystore - key: ${{ github.sha }} - - - run: ls - - run: ls ~ - - run: ls ~/keystore # Test ================================= @@ -95,9 +78,8 @@ jobs: path: ~/keystore key: ${{ github.sha }} - - run: ls ~ - - run: ls - - run: ls / + - run: ls ~/keystore + - name: Run tests run: ./gradlew test env: From fb6447f895eb613ac8b0fc4238c79e958f6ca19e Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 21:41:08 +0300 Subject: [PATCH 73/76] Update actions.yml --- .github/workflows/actions.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 3f4896c..c0823d9 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -54,6 +54,7 @@ jobs: # Clone keystore repository - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git - run: mkdir ~/keystore + # Copy keystore to keystore directory - run: find . -name '*.jks' -exec cp "{}" ~/keystore/ \; - run: ls ~/keystore - uses: actions/cache@v2 @@ -62,8 +63,6 @@ jobs: path: ~/keystore key: ${{ github.sha }} - # Test ================================= - tests: needs: [ copy_keystore ] runs-on: ubuntu-latest @@ -85,9 +84,8 @@ jobs: env: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - STORE_FILE: ${{ secrets.STORE_FILE }} + STORE_FILE: ~/keystore/keystore.jks STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - KEYSTORE: ${{ secrets.KEYSTORE }} lint: needs: [ copy_keystore ] From 0ad403e834ad508c1bc64efc9c71246046c15a5d Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 21:51:12 +0300 Subject: [PATCH 74/76] Update actions.yml --- .github/workflows/actions.yml | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index c0823d9..46684d4 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -94,12 +94,19 @@ jobs: image: javavirys/android:30.0.3 steps: - uses: actions/checkout@v2 + + - uses: actions/cache@v2 + id: restore-build + with: + path: ~/keystore + key: ${{ github.sha }} + - name: Run lint run: ./gradlew lint env: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - STORE_FILE: ${{ secrets.STORE_FILE }} + STORE_FILE: ~/keystore/keystore.jks STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - name: Archive artifacts @@ -117,12 +124,18 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/cache@v2 + id: restore-build + with: + path: ~/keystore + key: ${{ github.sha }} + - name: Build apks run: ./gradlew assemble env: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - STORE_FILE: ${{ secrets.STORE_FILE }} + STORE_FILE: ~/keystore/keystore.jks STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - name: Archive artifacts @@ -140,12 +153,19 @@ jobs: image: javavirys/android:30.0.3 steps: - uses: actions/checkout@v2 + + - uses: actions/cache@v2 + id: restore-build + with: + path: ~/keystore + key: ${{ github.sha }} + - name: Build bundles run: ./gradlew bundle env: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - STORE_FILE: ${{ secrets.STORE_FILE }} + STORE_FILE: ~/keystore/keystore.jks STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - name: Archive artifacts From 65050042f57f726fa2e6bb9f7eae12ca4294185a Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 21:56:44 +0300 Subject: [PATCH 75/76] Update actions.yml --- .github/workflows/actions.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 46684d4..0cabf9b 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -35,11 +35,6 @@ jobs: steps: - uses: actions/checkout@v2 - - run: env - - - run: ls / -a - -# - run: apt install -y openssh-client - run: apt install -y git # Add private key to ssh agent @@ -48,9 +43,6 @@ jobs: - run: eval "$(ssh-agent -s)" && ssh-add /root/.ssh/id_rsa - run: ssh-keyscan github.com >> /root/.ssh/known_hosts - - run: echo ~ - - run: ls -a /root/.ssh - # Clone keystore repository - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git - run: mkdir ~/keystore @@ -101,6 +93,8 @@ jobs: path: ~/keystore key: ${{ github.sha }} + - run: ls ~/keystore + - name: Run lint run: ./gradlew lint env: @@ -130,6 +124,8 @@ jobs: path: ~/keystore key: ${{ github.sha }} + - run: ls ~/keystore + - name: Build apks run: ./gradlew assemble env: @@ -159,6 +155,8 @@ jobs: with: path: ~/keystore key: ${{ github.sha }} + + - run: ls ~/keystore - name: Build bundles run: ./gradlew bundle From 0f4655eaa8fa663ab61520fe3acc484044cafbf7 Mon Sep 17 00:00:00 2001 From: javavirys Date: Fri, 20 Aug 2021 23:54:03 +0300 Subject: [PATCH 76/76] Update actions.yml --- .github/workflows/actions.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 0cabf9b..bed7e5e 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -45,14 +45,14 @@ jobs: # Clone keystore repository - run: git clone git@github.com:javavirys/MediaPlayerKeystore.git - - run: mkdir ~/keystore + - run: mkdir /keystore # Copy keystore to keystore directory - - run: find . -name '*.jks' -exec cp "{}" ~/keystore/ \; - - run: ls ~/keystore + - run: find . -name '*.jks' -exec cp "{}" /keystore/ \; + - run: ls /keystore - uses: actions/cache@v2 id: restore-build with: - path: ~/keystore + path: /keystore key: ${{ github.sha }} tests: @@ -66,17 +66,17 @@ jobs: - uses: actions/cache@v2 id: restore-build with: - path: ~/keystore + path: /keystore key: ${{ github.sha }} - - run: ls ~/keystore + - run: ls /keystore - name: Run tests run: ./gradlew test env: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - STORE_FILE: ~/keystore/keystore.jks + STORE_FILE: /keystore/keystore.jks STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} lint: @@ -90,17 +90,17 @@ jobs: - uses: actions/cache@v2 id: restore-build with: - path: ~/keystore + path: /keystore key: ${{ github.sha }} - - run: ls ~/keystore + - run: ls /keystore - name: Run lint run: ./gradlew lint env: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - STORE_FILE: ~/keystore/keystore.jks + STORE_FILE: /keystore/keystore.jks STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - name: Archive artifacts @@ -121,17 +121,17 @@ jobs: - uses: actions/cache@v2 id: restore-build with: - path: ~/keystore + path: /keystore key: ${{ github.sha }} - - run: ls ~/keystore + - run: ls /keystore - name: Build apks run: ./gradlew assemble env: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - STORE_FILE: ~/keystore/keystore.jks + STORE_FILE: /keystore/keystore.jks STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - name: Archive artifacts @@ -153,17 +153,17 @@ jobs: - uses: actions/cache@v2 id: restore-build with: - path: ~/keystore + path: /keystore key: ${{ github.sha }} - - run: ls ~/keystore + - run: ls /keystore - name: Build bundles run: ./gradlew bundle env: KEY_ALIAS: ${{ secrets.KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - STORE_FILE: ~/keystore/keystore.jks + STORE_FILE: /keystore/keystore.jks STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - name: Archive artifacts