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 zcmbPpV^yO?slTWCJ2%d=r{pg9*OmQ`Y)TYXXSi0?wSPjN>-WW48@GH@dvIX3+@h$bQA|cs z{ih}NR~eaAYd!5UnR{{H`;5xp%fh*t+1(pl!?oVV&a~de#>nhl8~u9rTE4{rPA!X9 zXQzb8$E4nndb&Y#(V7W!K67r{v`z8DSHrzc|82N$`{||#iT_8aK$s}svIZ3yqMtJR^4=TkkCEXVqGVlL#?StsTs~;2p^>3BcbPt?OtE-(1xl0BKvZSA^bk4?VM z9|Y}{J;ubcb~D$U!~Kc7cKE7XS67IO&}o?XF-;vlO=J zTg#qPbLGj5NoUf(Dm-6(N$d87=IuL9FX;$#GD-^1zbz`c@^eb>rVT<-!FG+>tKK|& z#_a6mF47{>^&9?2F!hE)qZFW)(7r*gSr*t+{G*XvHf@qxo0m`cKHZ79*kf*2zWXmN9eYuXkha5?5Hg z>X23aymw4-mamrINj4DmN!=!!5)?gSm#AQu(CbY}db->j_7#0|-jVXew8pb&?!s%q zDsNuVlgdulPRNAC6skuSdvv-G{Wd^*#a%OP@tq+fOmLoA&d^ z{-?&zGT+^dyKm_6ubekGNqck5%tfcK9DeC>zClg%;y%g7ZO3*Lom>CK>e25HOM3$Y zRhuhV-Fm$rFpDn9-?)u)d+$e?J1%SXocVL9Y-0ID^=_ras^&8r?XRWgPGR3XdF8o- zm+OD7la@QL*K}oytIef~J1u_M2X1bhr|g+nxnj-jg;#zpGSSJ9`Z0S^$$FOyenuOX z=t)SwVfv-v_V-jJcfjYM)SiMuL&on^?eGPmzaF*+GLI7jSuV#6gxGTX0BYo62!n^v+Mi|>-R@)t}M=9A*yo2 z?M<%M=hQ{qEfUX5B68ne-Ffst$6up+j@*i;Y^!$PVPD(%ZHA^j>*aH54ZHiq!xC%j8Q^%1_POcHF$V!~f3L^0Pi44m@{bk+>3Sm3RN*!B1Iw$%i+}%-nx! z`bCl1YJyXful~^FGAI^(wsK#kll`C0AF;eMFCKAOZ_X-TV>j% z<@EP|`^os?pTL!)UK^D3za}sFxp4QvHIF>_HeL(1wR>IkNvqtwXIZPkO^yGW3mK}) zikCXh^PL^wmC>WS!*$xK`Cq-Zd~=#5CsmxV_T<&M_ZOZB^!>rt8 ztjk;X&C4zGwo&l?Z^0N<%l=Ps-|xE}7B`~bhCc4<5RE)%_~M>q^W-d>27iy7C8uiR z+>TAwS30`g=CSl_5O zn7$!F!2Db)|H@mXv(LOJc|COptLVnRy07NwYI!I0uc>=2IeDgo)3%d7EZ@$4?wx0F znx#tRN>LDlSW=K zt&6!I#D0n1b9~|}Db16!3`*y_yz<}wu~Tnn_Bj`Cfr+yBF0h6E(Y(|dRyLzGa7Jz8 z(Td!gN5YEUXz#xJN9vW>gN+Q|Dveajo~zbJl&^cF|3`5j$8v&^?342zhHIAguyT}!AE*z>VicR{l=-Fov-y`_lG>U~|NWn@xBK{^ z>hy`wQ}+#S-Y|H=x2y2Qx9PoK&%Qd(f1&Z!PJW&gUV%`1#!Yj)l1io*DEmE>)KKR7 z*Y~;KqR4BxICtL~8Ig?D|2^-ve_;sH`upa)!oddz{;xOAQr3I3&sRuOO6|YcIj1#m ziv)jV2fE9*30!!;Hmt**=PUCZ6Z_yRQ=(5YTX21qw>d!Gspae|A%qzo4ix8P5n=Q#Tl)gtkauf1?yDKF1xhu zm%sI;9Va%nyJ)cqo#