From 22bc76c39f901987f1780778aa83b1024bb89903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 5 Apr 2023 16:48:47 +0200 Subject: [PATCH] ci: use Nix shell for Linux library builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Just noticed that was the only one not using it. Signed-off-by: Jakub SokoĊ‚owski --- _assets/ci/Jenkinsfile | 2 +- _assets/ci/Jenkinsfile.android | 4 ++-- _assets/ci/Jenkinsfile.docker | 2 +- _assets/ci/Jenkinsfile.ios | 2 +- _assets/ci/Jenkinsfile.linux | 18 ++++++++++++------ _assets/ci/Jenkinsfile.tests | 4 ++-- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/_assets/ci/Jenkinsfile b/_assets/ci/Jenkinsfile index 70f63530a..a64bae746 100644 --- a/_assets/ci/Jenkinsfile +++ b/_assets/ci/Jenkinsfile @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.6.7' +library 'status-jenkins-lib@v1.7.0' pipeline { agent { label 'linux' } diff --git a/_assets/ci/Jenkinsfile.android b/_assets/ci/Jenkinsfile.android index b478eead9..1f0bec868 100644 --- a/_assets/ci/Jenkinsfile.android +++ b/_assets/ci/Jenkinsfile.android @@ -1,7 +1,7 @@ -library 'status-jenkins-lib@v1.6.7' +library 'status-jenkins-lib@v1.7.0' pipeline { - agent { label 'linux && x86_64' } + agent { label 'linux && x86_64 && nix-2.11' } parameters { string( diff --git a/_assets/ci/Jenkinsfile.docker b/_assets/ci/Jenkinsfile.docker index 0a7bdff51..43686f011 100644 --- a/_assets/ci/Jenkinsfile.docker +++ b/_assets/ci/Jenkinsfile.docker @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.6.7' +library 'status-jenkins-lib@v1.7.0' pipeline { agent { label 'linux' } diff --git a/_assets/ci/Jenkinsfile.ios b/_assets/ci/Jenkinsfile.ios index 8dbf27640..12bdf6062 100644 --- a/_assets/ci/Jenkinsfile.ios +++ b/_assets/ci/Jenkinsfile.ios @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.6.7' +library 'status-jenkins-lib@v1.7.0' pipeline { agent { label 'macos && aarch64 && go-1.18 && nix-2.11' } diff --git a/_assets/ci/Jenkinsfile.linux b/_assets/ci/Jenkinsfile.linux index d88d7e35f..5454e5234 100644 --- a/_assets/ci/Jenkinsfile.linux +++ b/_assets/ci/Jenkinsfile.linux @@ -1,7 +1,7 @@ -library 'status-jenkins-lib@v1.6.7' +library 'status-jenkins-lib@v1.7.0' pipeline { - agent { label 'linux && x86_64 && go-1.18' } + agent { label 'linux && x86_64 && nix-2.11' } parameters { string( @@ -44,10 +44,16 @@ pipeline { } /* Sanity-check C bindings */ - stage('Bindings Check') { - steps { - sh 'make statusgo-library' - } + stage('Build Static Lib') { + steps { script { + nix.shell('make statusgo-library', pure: false) + } } + } + + stage('Build Shared Lib') { + steps { script { + nix.shell('make statusgo-shared-library', pure: false) + } } } stage('Archive') { diff --git a/_assets/ci/Jenkinsfile.tests b/_assets/ci/Jenkinsfile.tests index ffbe2febe..bfd6da64d 100644 --- a/_assets/ci/Jenkinsfile.tests +++ b/_assets/ci/Jenkinsfile.tests @@ -1,7 +1,7 @@ -library 'status-jenkins-lib@v1.6.7' +library 'status-jenkins-lib@v1.7.0' pipeline { - agent { label 'linux && x86_64 && go-1.18' } + agent { label 'linux && x86_64 && nix-2.11' } parameters { string(