Skip to content

Commit a27134f

Browse files
committed
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 <i@mandrigin.ru>
1 parent a0cea0b commit a27134f

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

Jenkinsfile.nightly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ timeout(90) {
6565
def artifact = (artifact_dir + 'app-release.apk')
6666
def server = Artifactory.server('artifacts')
6767
def shortCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim().take(6)
68-
def filename = 'im.status.ethereum-' + shortCommit + '.apk'
68+
def filename = 'im.status.ethereum-' + shortCommit + '-nightly' + '.apk'
6969
def newArtifact = (artifact_dir + filename)
7070
sh ('mv ' + artifact + ' ' + newArtifact)
7171
def uploadSpec = '{ "files": [ { "pattern": "*apk/release/' + filename + '", "target": "nightlies-local" }]}'

Jenkinsfile.nightly_fastlane

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ timeout(90) {
7676
def artifact = (artifact_dir + 'app-release.apk')
7777
def server = Artifactory.server('artifacts')
7878
shortCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim().take(6)
79-
def filename = 'im.status.ethereum-' + shortCommit + '.apk'
79+
def filename = 'im.status.ethereum-' + shortCommit + '-n-fl' + '.apk'
8080
def newArtifact = (artifact_dir + filename)
8181
sh ('cp ' + artifact + ' ' + newArtifact)
8282
def uploadSpec = '{ "files": [ { "pattern": "*apk/release/' + filename + '", "target": "nightlies-local" }]}'

Jenkinsfile.release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ timeout(90) {
7373
def artifact = (artifact_dir + 'app-release.apk')
7474
def server = Artifactory.server('artifacts')
7575
def shortCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim().take(6)
76-
def filename = 'im.status.ethereum-' + shortCommit + '.apk'
76+
def filename = 'im.status.ethereum-' + shortCommit + '-rel' + '.apk'
7777
def newArtifact = (artifact_dir + filename)
7878
sh ('mv ' + artifact + ' ' + newArtifact)
7979
def uploadSpec = '{ "files": [ { "pattern": "*apk/release/' + filename + '", "target": "nightlies-local" }]}'

0 commit comments

Comments
 (0)