fix release builds by renaming .env.prod to .env.release

This way the nix expression in nix/mobile/android/targets/release-android.nix will not fail.
And the naming of build types and `.env.${type}` files will be more consistent.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2019-07-17 07:41:18 -04:00
parent 8afd9c6b03
commit 158f9b4938
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
4 changed files with 8 additions and 31 deletions

View File

@ -1,20 +0,0 @@
DEBUG_WEBVIEW=1
DEFAULT_NETWORK=mainnet_rpc
ERC20_CONTRACT_WARNINGS=1
ETHEREUM_DEV_CLUSTER=1
EXTENSIONS=1
FLEET=eth.staging
GROUP_CHATS_ENABLED=1
LOG_LEVEL_STATUS_GO=info
LOG_LEVEL=debug
MAILSERVER_CONFIRMATIONS_ENABLED=1
MAINNET_WARNING_ENABLED=1
PFS_ENCRYPTION_ENABLED=1
PFS_TOGGLE_VISIBLE=1
POW_TARGET=0.002
POW_TIME=1
SNOOPY=0
STICKERS_ENABLED=0
PARTITIONED_TOPIC=0
CONTRACT_NODES=1
MOBILE_UI_FOR_DESKTOP=0

View File

@ -168,15 +168,12 @@ def changeId() {
} }
def updateEnv(type) { def updateEnv(type) {
def envFile = "${env.WORKSPACE}/.env" def envFile = "${env.WORKSPACE}/.env.jenkins"
/* select .env based on type of build */ /* select .env based on type of build */
def selectedEnv = '.env.jenkins' if (['nightly', 'release', 'e2e'].contains(type)) {
switch (type) { envFile = "${env.WORKSPACE}/.env.${type}"
case 'nightly': selectedEnv = '.env.nightly'; break
case 'release': selectedEnv = '.env.prod'; break
case 'e2e': selectedEnv = '.env.e2e'; break
} }
sh "cp ${selectedEnv} .env" sh "ln -sf ${envFile} .env"
/* find a list of .env settings to check for them in params */ /* find a list of .env settings to check for them in params */
def envContents = readFile(envFile) def envContents = readFile(envFile)
def envLines = envContents.split() def envLines = envContents.split()

View File

@ -256,7 +256,7 @@ platform :ios do
desc "`fastlane ios saucelabs` - upload .app to sauce labs" desc "`fastlane ios saucelabs` - upload .app to sauce labs"
desc "also notifies in a GitHub comments" desc "also notifies in a GitHub comments"
desc "expects to have an .apk prepared: `android/app/build/outputs/apk/release/app-release.apk`" desc "expects to have an .apk prepared: `android/result/app.apk`"
desc "expects to have a saucelabs access key as SAUCE_ACCESS_KEY env variable" desc "expects to have a saucelabs access key as SAUCE_ACCESS_KEY env variable"
desc "expects to have a saucelabs username token as SAUCE_USERNAME env variable" desc "expects to have a saucelabs username token as SAUCE_USERNAME env variable"
desc "expects to have a saucelabs destination name as SAUCE_LABS_NAME env variable" desc "expects to have a saucelabs destination name as SAUCE_LABS_NAME env variable"
@ -276,7 +276,7 @@ end
platform :android do platform :android do
# Optional env variables # Optional env variables
APK_PATH = ENV["APK_PATH"] || "android/app/build/outputs/apk/release/app-release.apk" APK_PATH = ENV["APK_PATH"] || "android/result/app.apk"
desc "Deploy a new internal build to Google Play" desc "Deploy a new internal build to Google Play"
desc "expects GOOGLE_PLAY_JSON_KEY environment variable" desc "expects GOOGLE_PLAY_JSON_KEY environment variable"
@ -311,7 +311,7 @@ platform :android do
end end
desc "`fastlane android upload_diawi` - upload .apk to diawi" desc "`fastlane android upload_diawi` - upload .apk to diawi"
desc "expects to have an .apk prepared: `android/app/build/outputs/apk/release/app-release.apk`" desc "expects to have an .apk prepared: `android/result/app.apk`"
desc "expects to have a diawi token as DIAWI_TOKEN env variable" desc "expects to have a diawi token as DIAWI_TOKEN env variable"
desc "expects to have a github token as GITHUB_TOKEN env variable" desc "expects to have a github token as GITHUB_TOKEN env variable"
desc "will fails if file isn't there" desc "will fails if file isn't there"
@ -322,7 +322,7 @@ platform :android do
end end
desc "`fastlane android saucelabs` - upload .apk to sauce labs" desc "`fastlane android saucelabs` - upload .apk to sauce labs"
desc "expects to have an .apk prepared: `android/app/build/outputs/apk/release/app-release.apk`" desc "expects to have an .apk prepared: `android/result/app.apk`"
desc "expects to have a saucelabs access key as SAUCE_ACCESS_KEY env variable" desc "expects to have a saucelabs access key as SAUCE_ACCESS_KEY env variable"
desc "expects to have a saucelabs username token as SAUCE_USERNAME env variable" desc "expects to have a saucelabs username token as SAUCE_USERNAME env variable"
desc "expects to have a saucelabs destination name as SAUCE_LABS_NAME env variable" desc "expects to have a saucelabs destination name as SAUCE_LABS_NAME env variable"