use dashes instead of dots in artifact filenames

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2018-08-30 08:05:41 -04:00
parent 00d4770685
commit 2a1468cfa9
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
2 changed files with 4 additions and 4 deletions

View File

@ -53,8 +53,8 @@ pipeline {
} }
stage('Upload') { stage('Upload') {
steps { script { steps { script {
e2eUrl = cmn.uploadArtifact(findFiles(glob: 'pkg/*.e2e.apk')[0].path) e2eUrl = cmn.uploadArtifact(findFiles(glob: 'pkg/*e2e.apk')[0].path)
apkUrl = cmn.uploadArtifact(findFiles(glob: "pkg/*.${cmn.getBuildType()}.apk")[0].path) apkUrl = cmn.uploadArtifact(findFiles(glob: "pkg/*${cmn.getBuildType()}.apk")[0].path)
dmgUrl = cmn.uploadArtifact(findFiles(glob: 'pkg/*.dmg')[0].path) dmgUrl = cmn.uploadArtifact(findFiles(glob: 'pkg/*.dmg')[0].path)
appUrl = cmn.uploadArtifact(findFiles(glob: 'pkg/*.AppImage')[0].path) appUrl = cmn.uploadArtifact(findFiles(glob: 'pkg/*.AppImage')[0].path)
/* special case for iOS Diawi links */ /* special case for iOS Diawi links */

View File

@ -115,7 +115,7 @@ def uploadArtifact(path) {
def timestamp() { def timestamp() {
def now = new Date(currentBuild.timeInMillis) def now = new Date(currentBuild.timeInMillis)
return now.format('yyMMdd.HHmmss', TimeZone.getTimeZone('UTC')) return now.format('yyMMdd-HHmmss', TimeZone.getTimeZone('UTC'))
} }
def gitCommit() { def gitCommit() {
@ -123,7 +123,7 @@ def gitCommit() {
} }
def pkgFilename(type, ext) { def pkgFilename(type, ext) {
return "StatusIm.${timestamp()}.${gitCommit()}.${type}.${ext}" return "StatusIm-${timestamp()}-${gitCommit()}-${type}.${ext}"
} }