diff --git a/.gitignore b/.gitignore index 252008e0..81cc9e9b 100644 --- a/.gitignore +++ b/.gitignore @@ -37,9 +37,6 @@ captures/ *.iml .idea -# Keystore files -*.jks - # External native build folder generated in Android Studio 2.2 and later .externalNativeBuild diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68c0735b..42e254a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,9 +20,22 @@ before_script: - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - chmod +x ./gradlew -build: +build_develop: script: - ./gradlew assembleDebug + only: + - develop artifacts: + name: "${CI_BUILD_NAME}" paths: - - app/build/outputs/ + - app/build/outputs/apk + +build_master: + script: + - ./gradlew assembleRelease + only: + - master + artifacts: + name: "${CI_BUILD_NAME}" + paths: + - app/build/outputs/apk diff --git a/ThmmyNoLife.jks b/ThmmyNoLife.jks new file mode 100644 index 00000000..d0a7c7f7 Binary files /dev/null and b/ThmmyNoLife.jks differ diff --git a/app/build.gradle b/app/build.gradle index ee2e5129..21815afe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,10 +13,22 @@ android { versionName "0.6" archivesBaseName = "mTHMMY-v$versionName" } + + signingConfigs { + release { + storeFile rootProject.file('ThmmyNoLife.jks') + storePassword System.getenv("KEYSTORE_PASS") + keyAlias System.getenv("KEY_NAME") + keyPassword System.getenv("KEY_PASS") + } + } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + if (System.getenv("CI")) + signingConfig signingConfigs.release } debug { def date = new Date().format('ddMMyy_HHmm');