From 145652d2d0ff0deb8ed3c7ad16a9d9f25c8c6da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Tue, 28 Sep 2021 13:57:19 +0200
Subject: [PATCH] ci: upgrade library and use of pkgFilename()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Depends on: https://github.com/status-im/status-jenkins-lib/pull/36

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ci/Jenkinsfile.combined | 4 ++--
 ci/Jenkinsfile.linux    | 6 +++---
 ci/Jenkinsfile.macos    | 4 ++--
 ci/Jenkinsfile.windows  | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined
index c07050f8de..634352b12c 100644
--- a/ci/Jenkinsfile.combined
+++ b/ci/Jenkinsfile.combined
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.3.0'
+library 'status-jenkins-lib@v1.3.3'
 
 pipeline {
   agent { label 'linux' }
@@ -44,7 +44,7 @@ pipeline {
         jenkins.copyArts(linux)
         jenkins.copyArts(windows)
         jenkins.copyArts(macos)
-        sha = "pkg/${utils.pkgFilename('sha256')}"
+        sha = "pkg/${utils.pkgFilename(ext: 'sha256')}"
         dir('pkg') {
           /* generate sha256 checksums for upload */
           sh "sha256sum * | tee ../${sha}"
diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux
index 105a452dc5..0153a1aaf6 100644
--- a/ci/Jenkinsfile.linux
+++ b/ci/Jenkinsfile.linux
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.3.0'
+library 'status-jenkins-lib@v1.3.3'
 
 pipeline {
   agent {
@@ -39,8 +39,8 @@ pipeline {
     /* Makefile assumes the compiler folder is included */
     QTDIR = "/opt/qt/5.14.0/gcc_64"
     /* Control output the filename */
-    STATUS_CLIENT_APPIMAGE = "pkg/${utils.pkgFilename('AppImage')}"
-    STATUS_CLIENT_TARBALL = "pkg/${utils.pkgFilename('tar.gz')}"
+    STATUS_CLIENT_APPIMAGE = "pkg/${utils.pkgFilename(ext: 'AppImage')}"
+    STATUS_CLIENT_TARBALL = "pkg/${utils.pkgFilename(ext: 'tar.gz')}"
   }
 
   stages {
diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos
index 81d65efb22..8b03db9985 100644
--- a/ci/Jenkinsfile.macos
+++ b/ci/Jenkinsfile.macos
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.3.0'
+library 'status-jenkins-lib@v1.3.3'
 
 pipeline {
   agent {
@@ -35,7 +35,7 @@ pipeline {
     QTDIR = '/usr/local/qt/clang_64'
     PATH = "${env.QTDIR}/bin:${env.PATH}"
     /* Control output the filename */
-    STATUS_CLIENT_DMG = "pkg/${utils.pkgFilename('dmg')}"
+    STATUS_CLIENT_DMG = "pkg/${utils.pkgFilename(ext: 'dmg')}"
     /* Apple Team ID for Notarization */
     MACOS_NOTARIZE_TEAM_ID = "DTX7Z4U3YA"
   }
diff --git a/ci/Jenkinsfile.windows b/ci/Jenkinsfile.windows
index d42366ef03..2dda1dc44d 100644
--- a/ci/Jenkinsfile.windows
+++ b/ci/Jenkinsfile.windows
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.3.0'
+library 'status-jenkins-lib@v1.3.3'
 
 pipeline {
   agent { label 'windows' }
@@ -30,9 +30,9 @@ pipeline {
     /* Disable colors in Nim compiler logs */
     NIMFLAGS = '--colors:off'
     /* Control output the filename */
-    STATUS_CLIENT_EXE = "pkg/${utils.pkgFilename('exe')}"
+    STATUS_CLIENT_EXE = "pkg/${utils.pkgFilename(ext: 'exe')}"
     /* 7zip archive filename */
-    STATUS_CLIENT_7Z = "pkg/${utils.pkgFilename('7z')}"
+    STATUS_CLIENT_7Z = "pkg/${utils.pkgFilename(ext: '7z')}"
     /* RFC 3161 timestamping URL for DigiCert */
     WINDOWS_CODESIGN_TIMESTAMP_URL = 'http://timestamp.digicert.com'
   }