diff --git a/ci/Dockerfile b/ci/Dockerfile index 44aefc3bef..a413df7412 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -40,7 +40,7 @@ RUN apt update -yq && apt install -yq software-properties-common \ && add-apt-repository -y ppa:git-core/ppa \ && add-apt-repository -y ppa:ubuntu-toolchain-r/test \ && apt update -yq && apt full-upgrade -yq && apt install -yq --no-install-recommends --fix-missing \ - gnupg2 openssh-client ca-certificates locales sudo jq curl wget fuse s3cmd file llvm tk-dev xz-utils \ + gnupg2 openssh-client ca-certificates locales sudo jq curl wget fuse s5cmd file llvm tk-dev xz-utils \ git make build-essential pkg-config extra-cmake-modules gcc-9 g++-9 \ libgl1-mesa-dev libsm6 libice6 libfontconfig1 libdbus-1-3 libssl-dev libz-dev \ zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev unixodbc-dev libpq-dev \ diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined index 57aa2a8dea..43cd399130 100644 --- a/ci/Jenkinsfile.combined +++ b/ci/Jenkinsfile.combined @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.8.13' +library 'status-jenkins-lib@v1.9.1' /* Object to store public URLs for description. */ urls = [:] @@ -86,7 +86,7 @@ pipeline { /* Generate sha256 checksums for all artifacts. */ sha = "./${utils.pkgFilename(ext: 'sha256')}" sh "sha256sum * | tee ./${sha}" - urls['SHA'] = s3.uploadArtifact(sha) + urls['SHA'] = s5cmd.upload(sha) jenkins.setBuildDesc(urls) } archiveArtifacts('pkg/*') diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux index 872402d65f..87576ea8f2 100644 --- a/ci/Jenkinsfile.linux +++ b/ci/Jenkinsfile.linux @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.8.18' +library 'status-jenkins-lib@v1.9.1' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() @@ -9,7 +9,7 @@ pipeline { /* Necessary image with Ubuntu 20.04 for older Glibc. */ docker { label 'linux' - image 'statusteam/nim-status-client-build:1.4.1-qt5.15.2' + image 'statusteam/nim-status-client-build:1.4.2-qt5.15.2' /* allows jenkins use cat and mounts '/dev/fuse' for linuxdeployqt */ args '--entrypoint="" --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse' } @@ -99,7 +99,7 @@ pipeline { parallel { stage('Upload') { steps { script { - env.PKG_URL = s3.uploadArtifact(env.STATUS_CLIENT_TARBALL) + env.PKG_URL = s5cmd.upload(env.STATUS_CLIENT_TARBALL) jenkins.setBuildDesc(AppImage: env.PKG_URL) } } } diff --git a/ci/Jenkinsfile.linux-nix b/ci/Jenkinsfile.linux-nix index 2cd8b92318..3f822cd320 100644 --- a/ci/Jenkinsfile.linux-nix +++ b/ci/Jenkinsfile.linux-nix @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.8.18' +library 'status-jenkins-lib@v1.9.1' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() @@ -88,7 +88,7 @@ pipeline { parallel { stage('Upload') { steps { script { - env.PKG_URL = s3.uploadArtifact(env.STATUS_CLIENT_TARBALL) + env.PKG_URL = s5cmd.upload(env.STATUS_CLIENT_TARBALL) jenkins.setBuildDesc(AppImage: env.PKG_URL) } } } diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos index a088c8ef98..dcd57caebe 100644 --- a/ci/Jenkinsfile.macos +++ b/ci/Jenkinsfile.macos @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.8.13' +library 'status-jenkins-lib@v1.9.1' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() @@ -116,7 +116,7 @@ pipeline { parallel { stage('Upload') { steps { script { - env.PKG_URL = s3.uploadArtifact(env.STATUS_CLIENT_DMG) + env.PKG_URL = s5cmd.upload(env.STATUS_CLIENT_DMG) jenkins.setBuildDesc(Dmg: env.PKG_URL) } } } diff --git a/ci/Jenkinsfile.tests-e2e b/ci/Jenkinsfile.tests-e2e index 47f5fddcce..00ae25e5e9 100644 --- a/ci/Jenkinsfile.tests-e2e +++ b/ci/Jenkinsfile.tests-e2e @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.8.6' +library 'status-jenkins-lib@v1.9.1' pipeline { diff --git a/ci/Jenkinsfile.tests-nim b/ci/Jenkinsfile.tests-nim index 12f64f2912..57ab12bfeb 100644 --- a/ci/Jenkinsfile.tests-nim +++ b/ci/Jenkinsfile.tests-nim @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.8.13' +library 'status-jenkins-lib@v1.9.1' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/Jenkinsfile.tests-ui b/ci/Jenkinsfile.tests-ui index d6d6200e00..ade56053a1 100644 --- a/ci/Jenkinsfile.tests-ui +++ b/ci/Jenkinsfile.tests-ui @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.8.13' +library 'status-jenkins-lib@v1.9.1' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/Jenkinsfile.windows b/ci/Jenkinsfile.windows index 75208b3de0..d4b1cf6bbe 100644 --- a/ci/Jenkinsfile.windows +++ b/ci/Jenkinsfile.windows @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.8.13' +library 'status-jenkins-lib@v1.9.1' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() @@ -95,12 +95,12 @@ pipeline { parallel { stage('Upload 7Z') { steps { script { - zip_url = s3.uploadArtifact(env.STATUS_CLIENT_7Z) + zip_url = s5cmd.upload(env.STATUS_CLIENT_7Z) } } } stage('Upload EXE') { steps { script { - exe_url = s3.uploadArtifact(env.STATUS_CLIENT_EXE) + exe_url = s5cmd.upload(env.STATUS_CLIENT_EXE) } } } } diff --git a/ci/cpp/Jenkinsfile.linux b/ci/cpp/Jenkinsfile.linux index b2e66fca03..413528df8e 100644 --- a/ci/cpp/Jenkinsfile.linux +++ b/ci/cpp/Jenkinsfile.linux @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.8.13' +library 'status-jenkins-lib@v1.9.1' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/cpp/Jenkinsfile.macos b/ci/cpp/Jenkinsfile.macos index 7b131d626a..706712d217 100644 --- a/ci/cpp/Jenkinsfile.macos +++ b/ci/cpp/Jenkinsfile.macos @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.8.13' +library 'status-jenkins-lib@v1.9.1' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() @@ -67,7 +67,7 @@ pipeline { parallel { stage('Upload') { steps { script { - env.PKG_URL = s3.uploadArtifact(env.STATUS_CLIENT_DMG) + env.PKG_URL = s5cmd.upload(env.STATUS_CLIENT_DMG) jenkins.setBuildDesc(Dmg: env.PKG_URL) } } } diff --git a/ci/cpp/Jenkinsfile.windows b/ci/cpp/Jenkinsfile.windows index 2a3556b2f2..d3141dea99 100644 --- a/ci/cpp/Jenkinsfile.windows +++ b/ci/cpp/Jenkinsfile.windows @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.8.13' +library 'status-jenkins-lib@v1.9.1' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() @@ -67,7 +67,7 @@ pipeline { parallel { stage('Upload') { steps { script { - exe_url = s3.uploadArtifact(env.STATUS_CLIENT_ZIP) + exe_url = s5cmd.upload(env.STATUS_CLIENT_ZIP) env.PKG_URL = exe_url jenkins.setBuildDesc(Zip: zip_url, Exe: exe_url) } }