From 76a911f874866feb9164ea8356912a7dbde170c8 Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 14 Dec 2018 02:08:21 +1000 Subject: [PATCH 1/8] Encrypt keystore --- .travis.yml | 67 ++++++++++++++++++---------------------- nr-commons.keystore.enc | Bin 0 -> 3932 bytes 2 files changed, 30 insertions(+), 37 deletions(-) create mode 100644 nr-commons.keystore.enc diff --git a/.travis.yml b/.travis.yml index d9abeedbe4..ee837a3491 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,54 +1,47 @@ language: android - addons: apt: packages: - - w3m - + - w3m env: global: - - ANDROID_TARGET=android-22 - - ANDROID_ABI=armeabi-v7a - - ADB_INSTALL_TIMEOUT=12 # in minutes - + - ANDROID_TARGET=android-22 + - ANDROID_ABI=armeabi-v7a + - ADB_INSTALL_TIMEOUT=12 jdk: - - oraclejdk8 - +- oraclejdk8 android: components: - - tools - - platform-tools - - build-tools-27.0.3 - - extra-google-m2repository - - extra-android-m2repository - - android-22 - - android-27 - - sys-img-${ANDROID_ABI}-${ANDROID_TARGET} + - tools + - platform-tools + - build-tools-27.0.3 + - extra-google-m2repository + - extra-android-m2repository + - android-22 + - android-27 + - sys-img-${ANDROID_ABI}-${ANDROID_TARGET} licenses: - - 'android-sdk-license-.+' - + - android-sdk-license-.+ before_script: - - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI - - emulator -avd test -no-audio -no-window -no-boot-anim & - - android-wait-for-emulator - +- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI +- emulator -avd test -no-audio -no-window -no-boot-anim & +- android-wait-for-emulator script: - - ./gradlew clean check connectedCheck jacocoTestReport - +- "./gradlew clean check connectedCheck jacocoTestReport" after_success: - - bash <(curl -s https://codecov.io/bash) - +- bash <(curl -s https://codecov.io/bash) after_failure: - - echo '*** Debug Unit Test Results ***' - - w3m -dump ${TRAVIS_BUILD_DIR}/app/build/reports/tests/*/classes/*Test.html - - echo '*** Connected Test Results ***' - - w3m -dump ${TRAVIS_BUILD_DIR}/app/build/reports/androidTests/connected/flavors/*/*Test.html - +- echo '*** Debug Unit Test Results ***' +- w3m -dump ${TRAVIS_BUILD_DIR}/app/build/reports/tests/*/classes/*Test.html +- echo '*** Connected Test Results ***' +- w3m -dump ${TRAVIS_BUILD_DIR}/app/build/reports/androidTests/connected/flavors/*/*Test.html before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ - +- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock +- rm -fr $HOME/.gradle/caches/*/plugin-resolution/ cache: directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ + - "$HOME/.gradle/caches/" + - "$HOME/.gradle/wrapper/" +before_install: +- openssl aes-256-cbc -K $encrypted_38a0ba8cc247_key -iv $encrypted_38a0ba8cc247_iv + -in nr-commons.keystore.enc -out nr-commons.keystore -d diff --git a/nr-commons.keystore.enc b/nr-commons.keystore.enc new file mode 100644 index 0000000000000000000000000000000000000000..1831dffa7a64aa3188d39959f7df7d2973795cfb GIT binary patch literal 3932 zcmV-i52Ns0z2N`6`AoSrrJM%aDYnKSl6pgPkcM>>(gFTYEAj{s@ehV z$x&vNXlI5O3*;c{XAtdNE#9uO76mGLB<`BEtY5D14q;ll7hoHrk;uU1_eIF89`rtz zxZs!$6_y!+*-}xkULwET0w&V%zx$OM9874E9sigjA+r__*hUHS0B4I5*l!!Ef;gA3 z%(96L=|&GP#Fsyo<3;d0j!RQ(1Al*4h{v`n{%E%NpsRSGC4T)sQbgj(PUv-v1jVK% zCGx;F1Li<%Frrwt%a~p>MU)g|NWjeabiCvs+K1Z|$DTa;>Qy(P!#rmv2S8`^X3Oi~ zW_4idhB^A|>(yA37<+~A9!z>4>;j@$P3@c)lU|6KhCB0`)%UWRb9B$e-_VD> zVfM38H?B&ZxD5&HPW01nm_)Oo(v}is&pk8x$F;On!y| z6}aU~V#uvk=Q+UlY{}l9RG1Gtr*ulE(wCYP%@ui7ktn#!R}SmRctd?F0hOWs5*&&3Z4S0bFj`aw3)5YYhsBLtG}q z+|#^$lNjI8kf_?3T5Z%mbB62wPQX}5C4$nCps>;_g^(iu`fPXyZF>Y)?A--9Jg?(Y zJi^6o!{l`bk6^-K=!oWGOLUcXU1 z)OSWHR1Uw4t!?BGAQf%$l`g~UL!&J(dTI1>O;ww2#Kk*>Nq|`@e^+k5hN8_3E-({T z*8x#{C&o_emlfnR6Baf{%KuAJ=84;!9TqvBDG?N%gzl~%>mJ0qcOTsXJZ&q0KB`;*W+njY3m{B? zN?L!>GD3Z8U25!ixJPLHpZNpgf%X&74GR2&!?v8)qi~#NX}TQx#=_hpI3i%)6iGJ7 z<_Tmfb*G8BW-q%+nHvs`=3jci2QNg1Zg`Fr3|S z_tG%La`RpzPhx{9v|*i!GB9zo+1>BWbNFUz&EVPNoKBO*0r2PpW0i zDK?xOnoi6*Wytg)$umBn&vX|13nwta`1a&b)x-bB(O3^7V1aDjiv~{u*(61X%f$T^ z+kDZM;OZ-~9PYtQwH0i#KISrkV}ptIlq{^ctqA z?#0VV;YYtY>>6c!9cma4H9~CyLXoG7jwt)< zpvi-ieuxou$wu>gMG^gnJ1H(KT7WiMpN}OmKwNn^#{3uaMy;C#)#>`K+Z!T+H`>SQ!ZHx1@a z1f#v+VbA0;c!*^`IU~(^TL&ChH^5UciBH4@FRccArWxDda>2=;Hq#9X4c}Gkrm?&u zAcHjCy}jst{UPmFiPSdFSu)E){%nU(K%ob;(xui>gR67h%I02lfr^oeeqjs1>iBC` z7nhRN%Z?myc3pj3SCkXuZDsph)sUNsT943Wfb&Qto9_fx!(TA#y^rLIF9r=tbMkiPy z_2tS^tZ$f>1oUGiQJNNQ-%FkR(G1>X_(O*E6m#uNQv=@>h~6G=*YIllyoYU~0C6@J zft&TO)S&*T8#S6rVj3puPI`|Ayu?*1`&?8?Mw>y+)lu4FB_V3uZB|&w(x!@*yus}e zQF~mG-IN3&ffO{acmFM}hGS*QA{q}7pB9jA%eFAVRUA6Fo5yUTd*S(5RgE8y7Eq(h z6;$YsGH?foEm+nVsb^~2DL|OM*(~n7wg1bycX7PlP00eKaBn&3W>Pxr7n()fchHOb z;K23`3tM!(*Gu^Ch#(?OpTh`ielVf}^&CTpKOs1rFq67Au(&!ukt$kaH!-8C+^Y`5 zG(iGH;jb|va*1O}AoU9%OPd=4ctVYnkB{`_N(@tyToi=~$Yh*9etweO*-Jo>H~%#^_#@nh^PH7 z{j9AvDM-_K^q|P6>zb6fOlbqsUo>{MSE0@UaQ}lv!WwsWC-G-1m_TsJY#UoKHEmYK zu74QFnLN=J`&7$Xj!Il{hR0REJ6|UY{UGF#G+?9-q(o8dw3gmKp@DjuDx3A*@u;26 z+4mt>N$oM96r|Ro?y&pGHu%Xs_ze%28&Tcq!FW4{^-3W0avy>$xzr$YFd@JpQ1Uuq zbh-q2;0G_2YqNx-We5Unse4|M()4|OcBuXcj5C&Vb-_e(VdbuK36Mg_DXSy;j%I#% zBX=5+cu2bExA-T(vGf$yxR?+=-M3LXuXAsLIpIwfhs2F?~ z@$xCC^hULi9NSJ<38J2x(}mNs1RD7z~XazOk=q%Hc?lOT-yl?CP0O51(04uUt)H6Mfe-?-qpw8-#!i3rsk zc9<6N)DiZNOw{yfT~1~A-Jku$-i8-ghUta$xAd90oK56)cf-95Wc5yfSBMfBdCn*G zu{-+tr|hXL&uS&ij4xofXyPPh<)e@bvtWB^8_`zw(DO7L`yK{(hvdE=Aq!yVL-; zNswy(M_Uns^39ZA23~1a&JH{WYpY?C7LA{164V zoo%)cEOAtIud@VVldSx83`x2yh6r#>+rjuO8{j}Oxu2ut>hrqgYsDma2z)}TuE!q1 z_EmS~av_<4<6b*m00O{pbyZTL#Oj~lRY+&B;nNf!99)32P7|ZOi6w(Sf|iv$j$(o? zoG#fbs*g2NOks+jW-lG>+mBvSzG0y4j%NQ35|`AKiVA$ zo^O+9InTZO#Z_F>QCLY^#zP?0_KK6n)PpX7xA?X=V^5a)PR!J%rret*8q;haSVlI$n%dqVJh*87mdmIxA*$c q&+sw^QY1Ag*F5By!pWL(CudTIp|>|oVVN1*z6k3&UDh(4x#|F5w~3?x literal 0 HcmV?d00001 From 135671043c4eb5a20f08894e29c486975c2b4e47 Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 14 Dec 2018 02:22:45 +1000 Subject: [PATCH 2/8] Modify build.gradle to add signing configs for env vars --- app/build.gradle | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index c2c02d2a4f..24f1627947 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -117,12 +117,17 @@ android { test.assets.srcDirs += 'src/main/assets' test.resources.srcDirs += 'src/main/resoures' } + + signingConfigs { + release + } buildTypes { release { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' testProguardFile 'test-proguard-rules.txt' + signingConfig signingConfigs.release } debug { minifyEnabled true @@ -132,6 +137,16 @@ android { versionNameSuffix "-debug-" + getBranchName() + "~" + getBuildVersion() } } + + def isRunningOnTravis = System.getenv("CI") == "true" + + if (isRunningOnTravis) { + // configure keystore based on env vars in Travis for automated alpha builds + signingConfigs.release.storeFile = file("../OurStore.keystore") + signingConfigs.release.storePassword = System.getenv("keystore_password") + signingConfigs.release.keyAlias = System.getenv("key_alias") + signingConfigs.release.keyPassword = System.getenv("key_password") + } flavorDimensions 'tier' productFlavors { From 81782d91db8b195a3270a300d71b2c873a6b3503 Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 14 Dec 2018 02:30:48 +1000 Subject: [PATCH 3/8] Fixed keystore name --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 24f1627947..23d6fd9db6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -142,7 +142,7 @@ android { if (isRunningOnTravis) { // configure keystore based on env vars in Travis for automated alpha builds - signingConfigs.release.storeFile = file("../OurStore.keystore") + signingConfigs.release.storeFile = file("../nr-commons.keystore") signingConfigs.release.storePassword = System.getenv("keystore_password") signingConfigs.release.keyAlias = System.getenv("key_alias") signingConfigs.release.keyPassword = System.getenv("key_password") From fb7de46d78886585445784cc014b6ace1d77e11f Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 14 Dec 2018 03:08:11 +1000 Subject: [PATCH 4/8] Remove encrypted file that is causing build errors --- nr-commons.keystore.enc | Bin 3932 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 nr-commons.keystore.enc diff --git a/nr-commons.keystore.enc b/nr-commons.keystore.enc deleted file mode 100644 index 1831dffa7a64aa3188d39959f7df7d2973795cfb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3932 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 From 9be5afbd9955f1e363734cc070ce86689afc7837 Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 14 Dec 2018 03:16:42 +1000 Subject: [PATCH 5/8] Add encrypted keystore again --- nr-commons.keystore.enc | Bin 0 -> 3936 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 nr-commons.keystore.enc diff --git a/nr-commons.keystore.enc b/nr-commons.keystore.enc new file mode 100644 index 0000000000000000000000000000000000000000..cead38b16d4496f2de1adbde878ed1614372e9b1 GIT binary patch literal 3936 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 literal 0 HcmV?d00001 From 19250de74234856f7999bdc1665297b0db04b623 Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 15 Dec 2018 01:05:05 +1000 Subject: [PATCH 6/8] Remove failed keystore again... --- nr-commons.keystore.enc | Bin 3936 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 nr-commons.keystore.enc diff --git a/nr-commons.keystore.enc b/nr-commons.keystore.enc deleted file mode 100644 index cead38b16d4496f2de1adbde878ed1614372e9b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3936 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 From d1ea77b99f062d100728abf8f372d4f4e066e49d Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 15 Dec 2018 01:06:27 +1000 Subject: [PATCH 7/8] Add keystore encrypted by Nicolas --- nr-commons.keystore.enc | Bin 0 -> 3920 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 nr-commons.keystore.enc diff --git a/nr-commons.keystore.enc b/nr-commons.keystore.enc new file mode 100644 index 0000000000000000000000000000000000000000..aba0402868937e21e6f3e6301e67ea59852509fb GIT binary patch literal 3920 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 Date: Sat, 15 Dec 2018 01:08:29 +1000 Subject: [PATCH 8/8] Modify env var names for key and iv --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ee837a3491..41f1455741 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,5 +43,5 @@ cache: - "$HOME/.gradle/caches/" - "$HOME/.gradle/wrapper/" before_install: -- openssl aes-256-cbc -K $encrypted_38a0ba8cc247_key -iv $encrypted_38a0ba8cc247_iv +- openssl aes-256-cbc -K $encrypted_7b5c925cc32c_key -iv $encrypted_7b5c925cc32c_iv -in nr-commons.keystore.enc -out nr-commons.keystore -d