From efd1496e4ecc8203958aea7191605765a2b7ae67 Mon Sep 17 00:00:00 2001 From: Lorenzo Delgado Date: Tue, 25 Oct 2022 16:58:52 +0200 Subject: [PATCH] ci(jenkins): use MAKEFLAGS and NIMFLAGS pipeline params in build and test stages --- ci/Jenkinsfile.prs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/Jenkinsfile.prs b/ci/Jenkinsfile.prs index 2f3926dc4a..041a5b5406 100644 --- a/ci/Jenkinsfile.prs +++ b/ci/Jenkinsfile.prs @@ -53,8 +53,8 @@ pipeline { v1changed = versionWasChanged('v1') v2changed = versionWasChanged('v2') /* TODO: Re-add caching of Nim compiler. */ - nix.shell("make V=${params.VERBOSITY} update", pure: false) - nix.shell("make V=${params.VERBOSITY} deps", pure: false) + nix.shell("make ${params.MAKEFLAGS} V=${params.VERBOSITY} update", pure: false) + nix.shell("make ${params.MAKEFLAGS} V=${params.VERBOSITY} deps", pure: false) } } } stage('Binaries') { @@ -62,13 +62,13 @@ pipeline { stage('V1') { when { expression { v1changed } } steps { script { - nix.shell("make V=${params.VERBOSITY} v1") + nix.shell("make ${params.MAKEFLAGS} NIMFLAGS=\"${params.NIMFLAGS}\" V=${params.VERBOSITY} v1") } } } stage('V2') { when { expression { v2changed } } steps { script { - nix.shell("make V=${params.VERBOSITY} v2") + nix.shell("make ${params.MAKEFLAGS} NIMFLAGS=\"${params.NIMFLAGS}\" V=${params.VERBOSITY} v2") } } } } @@ -79,13 +79,13 @@ pipeline { stage('V1') { when { expression { v1changed } } steps { script { - nix.shell("make V=${params.VERBOSITY} test1") + nix.shell("make ${params.MAKEFLAGS} NIMFLAGS=\"${params.NIMFLAGS}\" V=${params.VERBOSITY} test1") } } } stage('V2') { when { expression { v2changed } } steps { script { - nix.shell("make V=${params.VERBOSITY} test2") + nix.shell("make ${params.MAKEFLAGS} NIMFLAGS=\"${params.NIMFLAGS}\" V=${params.VERBOSITY} test2") } } } }