From a27134fb44f088929ebbead49ecae74fbb04a001 Mon Sep 17 00:00:00 2001 From: Igor Mandrigin Date: Wed, 30 May 2018 13:44:21 +0200 Subject: [PATCH] Add a suffix (config identifier) to the Android artifacts. Otherwise, it is possible to override the artifact by building the same commit but in a different configuration. Signed-off-by: Igor Mandrigin --- Jenkinsfile.nightly | 2 +- Jenkinsfile.nightly_fastlane | 2 +- Jenkinsfile.release | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile.nightly b/Jenkinsfile.nightly index fb73362a6c..0c56c84e29 100644 --- a/Jenkinsfile.nightly +++ b/Jenkinsfile.nightly @@ -65,7 +65,7 @@ timeout(90) { def artifact = (artifact_dir + 'app-release.apk') def server = Artifactory.server('artifacts') def shortCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim().take(6) - def filename = 'im.status.ethereum-' + shortCommit + '.apk' + def filename = 'im.status.ethereum-' + shortCommit + '-nightly' + '.apk' def newArtifact = (artifact_dir + filename) sh ('mv ' + artifact + ' ' + newArtifact) def uploadSpec = '{ "files": [ { "pattern": "*apk/release/' + filename + '", "target": "nightlies-local" }]}' diff --git a/Jenkinsfile.nightly_fastlane b/Jenkinsfile.nightly_fastlane index 8d2d4075f5..99f13130cb 100644 --- a/Jenkinsfile.nightly_fastlane +++ b/Jenkinsfile.nightly_fastlane @@ -76,7 +76,7 @@ timeout(90) { def artifact = (artifact_dir + 'app-release.apk') def server = Artifactory.server('artifacts') shortCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim().take(6) - def filename = 'im.status.ethereum-' + shortCommit + '.apk' + def filename = 'im.status.ethereum-' + shortCommit + '-n-fl' + '.apk' def newArtifact = (artifact_dir + filename) sh ('cp ' + artifact + ' ' + newArtifact) def uploadSpec = '{ "files": [ { "pattern": "*apk/release/' + filename + '", "target": "nightlies-local" }]}' diff --git a/Jenkinsfile.release b/Jenkinsfile.release index 4b1250ad4f..dac4c63a51 100644 --- a/Jenkinsfile.release +++ b/Jenkinsfile.release @@ -73,7 +73,7 @@ timeout(90) { def artifact = (artifact_dir + 'app-release.apk') def server = Artifactory.server('artifacts') def shortCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim().take(6) - def filename = 'im.status.ethereum-' + shortCommit + '.apk' + def filename = 'im.status.ethereum-' + shortCommit + '-rel' + '.apk' def newArtifact = (artifact_dir + filename) sh ('mv ' + artifact + ' ' + newArtifact) def uploadSpec = '{ "files": [ { "pattern": "*apk/release/' + filename + '", "target": "nightlies-local" }]}'