status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

bump status-react-jenkins to 1.2.0 

This updates a bunch of things in the Jenkins logic.
For details of that see:
https://github.com/status-im/status-react-jenkins/pull/12

It grew out of the changes I made to make PR builds available in Desktop client:
https://github.com/status-im/nim-status-client/pull/507

Changes:
- Bump `status-react-jenkins` library to newer version, probably `1.2.0`
- Update use of `utils.pkgFilename()` in `ci/Jenkinsfile.combined`
- Make all iOS builds go into the same folder: `status-ios`
- Drop e2e build type, infer it from Android ABIs set to `x86` only
- Simplify logic in `nix/mobile/android/release.nix.`

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2020-07-08 16:08:51 +02:00
parent ba0ae149ad
commit 84286782f6
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
8 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ci/Jenkinsfile.android
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.10'
library 'status-react-jenkins@v1.2.0'
pipeline {
agent { label 'linux' }
@ -101,12 +101,11 @@ pipeline {
} else { /* if no universal is available pick first */
env.PKG_URL = urls.first()
}
/* build type specific */
switch (btype) {
case 'nightly':
env.DIAWI_URL = android.uploadToDiawi(); break;
case 'e2e':
env.SAUCE_URL = android.uploadToSauceLabs(); break;
if (utils.isNightlyBuild()) {
env.DIAWI_URL = android.uploadToDiawi()
}
if (utils.isE2EBuild()) {
env.SAUCE_URL = android.uploadToSauceLabs()
}
}
}

7
ci/Jenkinsfile.combined
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.10'
library 'status-react-jenkins@v1.2.0'
pipeline {
agent { label 'linux' }
@ -44,9 +44,10 @@ pipeline {
//jenkins.copyArts(iose2e)
jenkins.copyArts(apk)
jenkins.copyArts(apke2e)
sha = "pkg/${utils.pkgFilename('sha256')}"
dir('pkg') {
/* generate sha256 checksums for upload */
sh "sha256sum * | tee ${utils.pkgFilename(btype, 'sha256')}"
sh "sha256sum * | tee ../${sha}"
archiveArtifacts('*')
}
} }
@ -60,7 +61,7 @@ pipeline {
iOS: utils.pkgUrl(ios), /*iOSe2e: utils.pkgUrl(iose2e),*/
Diawi: utils.utils.getEnv(ios, 'DIAWI_URL'),
/* upload the sha256 checksums file too */
SHA: s3.uploadArtifact(utils.pkgFind('sha256')),
SHA: s3.uploadArtifact(sha),
]
/* add URLs to the build description */
jenkins.setBuildDesc(urls)

2
ci/Jenkinsfile.ios
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.10'
library 'status-react-jenkins@v1.2.0'
pipeline {
agent { label 'macos-xcode-11.5' }

2
ci/Jenkinsfile.nix-cache
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.10'
library 'status-react-jenkins@v1.2.0'
pipeline {
agent { label params.AGENT_LABEL }

2
ci/tools/Jenkinsfile.fastlane-clean
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.10'
library 'status-react-jenkins@v1.2.0'
pipeline {
agent { label 'macos' }

2
ci/tools/Jenkinsfile.playstore-meta
View File

@ -1,4 +1,4 @@
library 'status-react-jenkins@v1.1.10'
library 'status-react-jenkins@v1.2.0'
pipeline {
agent { label 'linux' }

22
fastlane/Fastfile
View File

@ -82,7 +82,7 @@ def upload_to_saucelabs(file)
end
# builds an ios app with ad-hoc configuration and put it
# to "status-adhoc" output folder
# to "status-ios" output folder
# `readonly`:
# if true - only fetch existing certificates and profiles, don't upgrade from AppStoreConnect
# if false - read list of devices from AppStoreConnect, and upgrade the provisioning profiles from it
@ -110,7 +110,7 @@ def build_ios_adhoc(readonly: false, pr_build: false)
clean: true,
export_method: 'ad-hoc',
output_name: 'StatusIm',
output_directory: 'status-adhoc',
output_directory: 'status-ios',
export_options: {
signingStyle: 'manual',
provisioningProfiles: {
@ -122,7 +122,7 @@ def build_ios_adhoc(readonly: false, pr_build: false)
end
# builds an ios app with e2e configuration and put it
# to "status-e2e" output folder
# to "status-ios" output folder
def build_ios_e2e
# determine a simulator SDK installed
showsdks_output = sh('xcodebuild', '-showsdks')
@ -144,7 +144,7 @@ def build_ios_e2e
# it looks like i386 isn't supported by React Native
xcargs: 'ARCHS="x86_64" ONLY_ACTIVE_ARCH=NO',
# 3. directory where to up StatusIm.app
derived_data_path: 'status-e2e',
derived_data_path: 'status-ios',
output_name: 'StatusIm.app',
# -------------------------------------
# Normal stuff
@ -158,8 +158,8 @@ def build_ios_e2e
)
zip(
path: 'status-e2e/Build/Products/Release-iphonesimulator/StatusIm.app',
output_path: 'status-e2e/StatusIm.app.zip',
path: 'status-ios/Build/Products/Release-iphonesimulator/StatusIm.app',
output_path: 'status-ios/StatusIm.app.zip',
verbose: false
)
end
@ -222,7 +222,7 @@ platform :ios do
configuration: 'Release',
clean: true,
export_method: 'app-store',
output_directory: 'status_appstore',
output_directory: 'status-ios',
include_symbols: false,
export_options: {
"combileBitcode": true,
@ -231,7 +231,7 @@ platform :ios do
}
)
upload_to_testflight(
ipa: 'status_appstore/StatusIm.ipa',
ipa: 'status-ios/StatusIm.ipa',
skip_waiting_for_build_processing: true
)
end
@ -246,14 +246,14 @@ platform :ios do
end
desc '`fastlane ios upload-diawi` - upload .ipa to diawi'
desc 'expects to have an .ipa prepared: `status-adhoc/StatusIm.ipa`'
desc 'expects to have an .ipa prepared: `status-ios/StatusIm.ipa`'
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 "will fails if file isn't there"
desc '---'
desc 'Output: writes `fastlane/diawi.out` file url of the uploded file'
lane :upload_diawi do
ipa = ENV['DIAWI_IPA'] || 'status-adhoc/StatusIm.ipa'
ipa = ENV['DIAWI_IPA'] || 'status-ios/StatusIm.ipa'
upload_to_diawi(ipa)
end
@ -266,7 +266,7 @@ platform :ios do
desc "will fails if file isn't there"
lane :saucelabs do
upload_to_saucelabs(
'status-e2e/StatusIm.app.zip'
'status-ios/StatusIm.app.zip'
)
end

23
nix/mobile/android/release.nix
View File

@ -17,11 +17,13 @@ assert (lib.stringLength watchmanSockPath) > 0 -> stdenv.isDarwin;
let
inherit (lib)
toLower optionalString stringLength assertMsg
getConfig makeLibraryPath assertEnvVarSet;
getConfig makeLibraryPath assertEnvVarSet elem;
buildType = getConfig "build-type" "prod";
buildType = getConfig "build-type" "release";
buildNumber = getConfig "build-number" 9999;
gradleOpts = getConfig "android.gradle-opts" null;
# Used to detect end-to-end builds
androidAbiInclude = getConfig "android.abi-include" "armeabi-v7a;arm64-v8a;x86";
# Keystore can be provided via config and extra-sandbox-paths.
# If it is not we use an ad-hoc one generated with default password.
keystorePath = getConfig "android.keystore-path" keystore;
@ -29,15 +31,14 @@ let
baseName = "release-android";
name = "status-react-build-${baseName}";
envFileName = if (buildType == "release" || buildType == "nightly" || buildType == "e2e")
then ".env.${buildType}"
else if buildType != "" then ".env.jenkins"
envFileName =
if (elem buildType ["release" "nightly"]) then ".env.${buildType}"
else if androidAbiInclude == "x86" then ".env.e2e"
else if (elem buildType ["pr" "manual"]) then ".env.jenkins"
else ".env";
# There are only two types of Gradle builds: pr and release
gradleBuildType = if (buildType == "pr" || buildType == "e2e")
then "Pr"
else "Release"; # PR builds shouldn't replace normal releases
# There are only two types of Gradle build targets: pr and release
gradleBuildType = if buildType == "pr" then "Pr" else "Release";
apksPath = "./android/app/build/outputs/apk/${toLower gradleBuildType}";
patchedWatchman = watchmanFactory watchmanSockPath;
@ -72,7 +73,7 @@ in stdenv.mkDerivation rec {
# custom env variables derived from config
STATUS_GO_SRC_OVERRIDE = getConfig "nimbus.src-override" null;
ANDROID_ABI_SPLIT = getConfig "android.abi-split" "false";
ANDROID_ABI_INCLUDE = getConfig "android.abi-include" "armeabi-v7a;arm64-v8a;x86";
ANDROID_ABI_INCLUDE = androidAbiInclude;
# Android SDK/NDK for use by Gradle
ANDROID_SDK_ROOT = "${androidPkgs}";
@ -93,7 +94,7 @@ in stdenv.mkDerivation rec {
'';
postUnpack = ''
# Ensure we have the right .env file
cp -f ./${envFileName} ./.env
cp -bf ./${envFileName} ./.env
# Copy index.js and app/ input files
cp -ra --no-preserve=ownership ${jsbundle}/* ./