ci: use Nix shell and upgrade Qt to 5.15.8

Signed-off-by: Jakub Sokołowski <[email protected]>
status-im · Jan 23, 2023 · a3feaeb · a3feaeb
1 parent a63ac19
commit a3feaeb
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 801 deletions.
diff --git a/ci/Jenkinsfile.e2e b/ci/Jenkinsfile.e2e
diff --git a/ci/Jenkinsfile.imports b/ci/Jenkinsfile.imports
diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux
@@ -1,16 +1,11 @@
-library 'status-jenkins-lib@v1.6.3'
+library 'status-jenkins-lib@linux-use-nix'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
 
 pipeline {
   agent {
-    docker {
-      label 'linux'
-      image 'statusteam/nim-status-client-build:1.1.5'
-      /* allows jenkins use cat and mounts '/dev/fuse' for linuxdeployqt */
-      args '--entrypoint="" --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse'
-    }
+    label 'linux'
   }
 
   parameters {
@@ -48,25 +43,23 @@ pipeline {
     MAKEFLAGS = "-j4 V=${params.VERBOSE}"
     /* Disable colors in Nim compiler logs */
     NIMFLAGS = '--colors:off'
-    /* 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(ext: 'AppImage')}"
     STATUS_CLIENT_TARBALL = "pkg/${utils.pkgFilename(ext: 'tar.gz')}"
   }
 
   stages {
     stage('Deps') {
-      steps {
-        sh 'make update'
-        sh 'make deps'
-      }
+      steps { script {
+        nix.shell('make update', pure: false)
+        nix.shell('make deps', pure: false)
+      } }
     }
 
     stage('status-go') {
-      steps {
-        sh 'make status-go'
-      }
+      steps { script {
+        nix.shell('make status-go', pure: false)
+      } }
     }
 
     stage('Package') {

diff --git a/ci/Jenkinsfile.linux-cpp b/ci/Jenkinsfile.linux-cpp