From 36463f920d666b247538ede564478dd0f7ce6d05 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 9 Oct 2020 15:58:55 -0400 Subject: [PATCH] Signed Android releases, maybe --- .travis.yml | 23 +++++++++++++---------- android/build.gradle | 7 ++++++- bekeystore.jks.enc | Bin 0 -> 2368 bytes 3 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 bekeystore.jks.enc diff --git a/.travis.yml b/.travis.yml index 6b1dfd72ac..723ef74300 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,18 +5,22 @@ android: components: - android-29 - build-tools-29.0.3 - script: - git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds - cd ../MindustryBuilds - echo ${TRAVIS_TAG} -- if [ -n "$TRAVIS_TAG" ]; then echo versionName=5-fdroid-${TRAVIS_TAG:1}$'\n'versionCode=${TRAVIS_TAG:1} > version_fdroid.txt; git add .; git commit -m "Updating to build ${TRAVIS_TAG}"; fi +- if [ -n "$TRAVIS_TAG" ]; then echo versionName=5-fdroid-${TRAVIS_TAG:1}$'\n'versionCode=${TRAVIS_TAG:1} + > version_fdroid.txt; git add .; git commit -m "Updating to build ${TRAVIS_TAG}"; + fi - git tag ${TRAVIS_BUILD_NUMBER} - git config --global user.name "Build Uploader" -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds ${TRAVIS_BUILD_NUMBER}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds + ${TRAVIS_BUILD_NUMBER}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds; + fi - cd ../Mindustry - git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc -- if [ -n "$TRAVIS_TAG" ]; then cd ../Arc; git tag ${TRAVIS_TAG}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/Arc ${TRAVIS_TAG}; cd ../Mindustry; fi +- if [ -n "$TRAVIS_TAG" ]; then cd ../Arc; git tag ${TRAVIS_TAG}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/Arc + ${TRAVIS_TAG}; cd ../Mindustry; fi - "./gradlew test" - "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}" - "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}" @@ -25,7 +29,8 @@ script: - git clone --depth=1 https://github.com/MindustryGame/docs.git - cp -a Mindustry/core/build/docs/javadoc/. docs/ - cd docs -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git add .; git commit -m "Update ${TRAVIS_BUILD_NUMBER}"; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/MindustryGame/docs; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git add .; git commit -m "Update ${TRAVIS_BUILD_NUMBER}"; + git push https://Anuken:${GH_PUSH_TOKEN}@github.com/MindustryGame/docs; fi - cd ../Mindustry deploy: - provider: releases @@ -39,12 +44,10 @@ deploy: on: repo: Anuken/Mindustry tags: true -#- provider: script -# script: bash update_wiki.sh -# on: -# repo: Anuken/Mindustry -# tags: true env: global: - secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8= - secure: VEskj/0TVX2o7iUVXuVPysj/VSWmPhDl57SrT7/nBNN/P/8N5jFAvx8PMzG7qT0S5FzKxuV20psE4WylUGRKdeRtK7/QNBV7T3YqYYM6BUB1VeRpxe5hLxTeuBK3izglFO8DkdDqjUtzQSjzkoYT75ilROjhBrBUPhVek7UlbBHbaklPWYFXHnJmYS1FpZTdzqIj+Y0Gd1PSL2MzK4X74aAHl0qaDgsTwYwtKs7IAz+kFaTZBRpi9VjQHAFhDlkDR3jo9wQjH8/F6x0lCgV/FulSc37Okdb40sLFG98xcEA6gWh1NPMkz8CulUdVE7mj7SJNxLbNvoMNrWOVRjmEsn59p/9LiNC1F9ncFz9vjQjAmi7rMFFGHGxe5nn8cIAkpTvHQQkZoWHAA9SNJTDMMf09m2pRy/vvzx+a6NVxyC9iNrhLlnBg4gxAqRh0S6NU0uL+fuygKixn7rqlnb7KMT7bAbfcuV+dng6c8V7hYKDCh7sJbH8iJump1xkwoM7ecnU8fxJF/oKOr/fbk0Bfxu+Q9qYLrV1+DEdm93Vl2Thq+DBKmI66jRGSva6HeCLFo81PEiEjP1nLv75+kvVfOqVqJrZD1BrvoG2eWT/3hVLrN2kEIWWlpvQVC7FL11yWmYtAuOBh/vfhI76zKr+YTS6ccG9rqW4XeYjJytshe8M= +before_install: +- openssl aes-256-cbc -K $encrypted_05543ea905ba_key -iv $encrypted_05543ea905ba_iv + -in bekeystore.jks.enc -out bekeystore.jks -d diff --git a/android/build.gradle b/android/build.gradle index 59b698955a..ff178b8bed 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -76,7 +76,7 @@ android{ targetSdkVersion 29 versionName versionNameResult - versionCode vcode + versionCode = (System.getenv("CI") == "true" ? System.getenv("TRAVIS_TAG").toInteger() : vcode) if(project.hasProperty("release")){ props['androidBuildCode'] = (vcode + 1).toString() @@ -98,6 +98,11 @@ android{ storePassword RELEASE_STORE_PASSWORD keyAlias RELEASE_KEY_ALIAS keyPassword RELEASE_KEY_PASSWORD + }else if(System.getenv("CI") == "true"){ + storeFile = file("../bekeystore.jks") + storePassword = System.getenv("keystore_password") + keyAlias = System.getenv("keystore_alias") + keyPassword = System.getenv("keystore_alias_password") }else{ println("No keystore property found. Releases will be unsigned.") } diff --git a/bekeystore.jks.enc b/bekeystore.jks.enc new file mode 100644 index 0000000000000000000000000000000000000000..0742c7a87e203e754ad37e8c251c1b62baa08c44 GIT binary patch literal 2368 zcmV-G3BUH7*s6gzbx%nr?nVjC${x^9es=#^f?*RU0M>enzmSeapTgPpE4dT?gpY<_ zAKlBdyn6^U#;?02B)6>w>$5U5Bl-k`x2LN1Kwh{Jk@0rlv9$Ik;J}+6qFUuz0x}wp z%NW0UGB$fE<%%?&(Z26!dHbeU3j+s7fJIj-?OmBWx&{FQOMP4Go2?F`P(p;Gt7~Ld zA6#YF8s)GlqO6dd^9i=HwjuEKF};HSJPX@SEo2fG{i+eW3hk6l6LFZFgQtdqoT&m8 zFiDavbbJ%7!tf+>=^00%F$2H!*6`X2S4A) zvWc5xCfNzVp@=if?#%>{lj*~kNaQD1$)|AgL~D}{My;-6NU}}m;8MLE#sUPbvkIKU zk72sFO(fSRAYNGr7*cI50Th*kEpN;F(i5(C^}4%w24*=EJdUjgY<$$@n3BwA^&sb~ z(kk1~gSWWLq=;5RGGbS6+Z7q9^JI;(uo7BRK7lK$?B?bJLqbOsk5lCP7IFEgl8Kqg z@lp4|1>@{(B#%hK0319XOMpd4GqDFarIz$m3=@x{oznh|Pb_j+%AHKd_B)`P(MwK5 z82BEVaRXF5KQVh)gF(?9YirpRY37xg(w$(LVv!)Hl_}b1LSH~@$yoD z!c)#;b$+FbiAJE$wUcspIb58duSNrk7a*&u!a9GR?gCyp>ZjaeFcnN?wjE?rTbQ~P z5sDJ)vSKbR3$VU&_CvU2JITg!(E}? zj1ohx@Mi6QOc0@U=2|;HlrY_9`S`!(Gv;aT*;n2IM*Yfp3sCb?r)28aiP4d5JMYBV zsdI0r6(rb3>}@LZWugm&80U0YZSB>$#lVRDGTuQ8A<8{^yW9t@iT0Q&KLyjyCV;z+ z7ay6ul@P#l2WZkj1e4MlBjq-RxY^mbPu%r)%}nsX=SBn=)Kxle-_gPHYA$2Lu^gGd z%9qg;nn>>FhB^^Vxji! zwV@EhVQZ{$GCDDQ!RGOwg&aEg$2r!V?vN~^&o-?*mxy(i3>R_M`)ale432LvS}k;=c3@se^?vN zi=KRQD-hl)s(p($x<#(A8D(?Stg52CpIKUL9WzY&hB3l9FVq{g9ETeoFTeKr0qFh^ z)Wu4$A}{r0r1_z{!K~s)4zbo#JwEGl@+x;njHZP!*(m=hp#XYzbEQF^O`A|kXpAkm zMV6|c^-8q%LYf{Lb6~B>)t%p=$Wcx40>NDnU121~G(ehdrUj>kzMgG%OFSS=|2P3! zeFy#_zWd#XIM`e5RpW|?6m?HR#G{xufBugYCN~^a(hR}|7HX-?l@Dr^(V6TPtlft?pSQ;u;$HRH3vHqc&9I7q zl+tPUq|!kucXxMw6`csHNX0(>Bvs7y!w7P3tcET!kl#z7BKYSq&O!-ZZ!~a=wF})j z-$3#?4cK9Lxx2@LOr;lk%P>9_`T&V)fW<84%*`(E`LK+98_e8>` zijB~DB0oC)_)Rlp(ZjR|@zi_-9EGC`;9c}vyvLF18Y#(|Fm<0q>QBG%i7vTo&O}QP zksaR9237ni(ur1fn1xZ8eSyVzZP~_jV`6U0r-4OTK*5aX)fHQ`WCA+f^6tu znC9q&SGwk(7z|R;%iQ(#f&i*uAG+mURlog0l{TPkJM*_)JjDp8m;3B%zwH55$P+1L z@i<4d<-xDy?SR^)t~Kw5%oFxHEvt^G+cygv#w!5~?i4=-D~P{A(At9EW2=FDy%BJ` zz$7sqnP7l)wa_DS3oFgOJkP4Hh*@0PY)%4|p@kyfy#(luk=?zR*Mr+``@b$Y>RMIa zo|82wdHATz#!nOfRtdh7xgmxp{Ev9dD!B!hf?W}QB+aJMuKG_q(zwX6heRp{63C9L zcqAr&M0SLoW%)PxY(6r@sKqPKX3_VxN?ZyZwQ!YYhpvao@7dx^aHsEsh{Ypx6Z8fq z7zNDNhuET)Nhw^7k}_zozk?%E`I@_2TqNr2V+)PPc@&(lWG3DQu$V^lqRWZFo|}eN m9wXb~pM#!CwbdDjtw*Ftpf@KZ