upload ipa files to DO and Diawi on release too

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2019-03-06 18:29:32 +01:00
parent 382eeaa696
commit 47f7dbac9d
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
5 changed files with 11 additions and 6 deletions

View File

@ -27,7 +27,7 @@ GEM
faraday_middleware (0.13.1) faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0) faraday (>= 0.7.4, < 1.0)
fastimage (2.1.5) fastimage (2.1.5)
fastlane (2.116.1) fastlane (2.117.1)
CFPropertyList (>= 2.3, < 4.0.0) CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0) babosa (>= 1.0.2, < 2.0.0)
@ -136,7 +136,7 @@ GEM
terminal-notifier (1.8.0) terminal-notifier (1.8.0)
terminal-table (1.8.0) terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (~> 1.1, >= 1.1.1)
tty-cursor (0.6.0) tty-cursor (0.6.1)
tty-screen (0.6.5) tty-screen (0.6.5)
tty-spinner (0.9.0) tty-spinner (0.9.0)
tty-cursor (~> 0.6.0) tty-cursor (~> 0.6.0)
@ -144,7 +144,7 @@ GEM
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.7.5) unf_ext (0.0.7.5)
unicode-display_width (1.4.1) unicode-display_width (1.5.0)
word_wrap (1.0.0) word_wrap (1.0.0)
xcodeproj (1.8.1) xcodeproj (1.8.1)
CFPropertyList (>= 2.3.3, < 4.0) CFPropertyList (>= 2.3.3, < 4.0)

View File

@ -75,7 +75,6 @@ pipeline {
} }
} }
stage('Upload') { stage('Upload') {
when { expression { cmn.getBuildType() != 'release' } }
steps { steps {
script { script {
env.PKG_URL = cmn.uploadArtifact(api) env.PKG_URL = cmn.uploadArtifact(api)

View File

@ -23,6 +23,8 @@ def bundle(type = 'nightly') {
} }
def pkg = cmn.pkgFilename(type, 'apk') def pkg = cmn.pkgFilename(type, 'apk')
sh "cp android/app/build/outputs/apk/release/app-release.apk ${pkg}" sh "cp android/app/build/outputs/apk/release/app-release.apk ${pkg}"
/* necessary for Diawi upload */
env.DIAWI_APK = pkg
return pkg return pkg
} }

View File

@ -43,6 +43,8 @@ def bundle(type) {
pkg = cmn.pkgFilename(type, 'ipa') pkg = cmn.pkgFilename(type, 'ipa')
sh "cp status-adhoc/StatusIm.ipa ${pkg}" sh "cp status-adhoc/StatusIm.ipa ${pkg}"
} }
/* necessary for Diawi upload */
env.DIAWI_IPA = pkg
return pkg return pkg
} }

View File

@ -210,7 +210,8 @@ platform :ios do
desc "---" desc "---"
desc "Output: writes `fastlane/diawi.out` file url of the uploded file" desc "Output: writes `fastlane/diawi.out` file url of the uploded file"
lane :upload_diawi do lane :upload_diawi do
upload_to_diawi("status-adhoc/StatusIm.ipa") ipa = ENV["DIAWI_IPA"] || "status-adhoc/StatusIm.ipa"
upload_to_diawi(ipa)
end end
desc "`fastlane ios saucelabs` - upload .app to sauce labs" desc "`fastlane ios saucelabs` - upload .app to sauce labs"
@ -274,7 +275,8 @@ platform :android do
desc "---" desc "---"
desc "Output: writes `fastlane/diawi.out` file url of the uploded file" desc "Output: writes `fastlane/diawi.out` file url of the uploded file"
lane :upload_diawi do lane :upload_diawi do
upload_to_diawi("android/app/build/outputs/apk/release/app-release.apk") apk = ENV["DIAWI_APK"] || "android/app/build/outputs/apk/release/app-release.apk"
upload_to_diawi(apk)
end end
desc "`fastlane android saucelabs` - upload .apk to sauce labs" desc "`fastlane android saucelabs` - upload .apk to sauce labs"