From ced3242cdb03f3b08dd9f3c6daf69fb081f2956e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 6 Jun 2023 11:13:32 +0200 Subject: [PATCH] ci: add NIMFLAGS parameter to jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- ci/Jenkinsfile.linux | 7 +++++-- ci/Jenkinsfile.macos | 7 +++++-- ci/Jenkinsfile.tests-e2e | 7 +++++-- ci/Jenkinsfile.tests-imports | 7 +++++-- ci/Jenkinsfile.tests-nim | 7 +++++-- ci/Jenkinsfile.windows | 7 +++++-- 6 files changed, 30 insertions(+), 12 deletions(-) diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux index e951bcfd2a..5445eb3d80 100644 --- a/ci/Jenkinsfile.linux +++ b/ci/Jenkinsfile.linux @@ -25,6 +25,11 @@ pipeline { description: 'Level of verbosity based on nimbus-build-system setup.', choices: ['0', '1', '2'] ) + string( + name: 'NIMFLAGS', + description: 'Extra Nim flags. Examples: --verbosity:2 --passL:"-v" --passC:"-v"', + defaultValue: '--colors:off' + ) } options { @@ -49,8 +54,6 @@ pipeline { TARGET = "linux/${getArch()}" /* Improve make performance */ 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.15.2/gcc_64" PATH = "${env.QTDIR}/bin:${env.PATH}" diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos index 978631b268..64458824a1 100644 --- a/ci/Jenkinsfile.macos +++ b/ci/Jenkinsfile.macos @@ -20,6 +20,11 @@ pipeline { description: 'Level of verbosity based on nimbus-build-system setup.', choices: ['0', '1', '2'] ) + string( + name: 'NIMFLAGS', + description: 'Extra Nim flags. Examples: --verbosity:2 --passL:"-v" --passC:"-v"', + defaultValue: '--colors:off' + ) } options { @@ -44,8 +49,6 @@ pipeline { TARGET = "macos/${getArch()}" /* Improve make performance */ MAKEFLAGS = "-j4 V=${params.VERBOSE}" - /* Disable colors in Nim compiler logs */ - NIMFLAGS = '--colors:off' /* WARNING: Qt 5.15.8 installed via Brew. */ QTDIR = '/opt/homebrew/opt/qt@5' PATH = "${env.QTDIR}/bin:${env.PATH}" diff --git a/ci/Jenkinsfile.tests-e2e b/ci/Jenkinsfile.tests-e2e index 77fd7a9328..f33c717708 100644 --- a/ci/Jenkinsfile.tests-e2e +++ b/ci/Jenkinsfile.tests-e2e @@ -29,6 +29,11 @@ pipeline { description: 'Level of verbosity based on nimbus-build-system setup.', choices: ['0', '1', '2'] ) + string( + name: 'NIMFLAGS', + description: 'Extra Nim flags. Examples: --verbosity:2 --passL:"-v" --passC:"-v"', + defaultValue: '--colors:off' + ) } options { @@ -58,8 +63,6 @@ pipeline { TARGET = 'tests/e2e' /* Improve make performance */ 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.15.2/gcc_64' PATH = "${env.QTDIR}/bin:${env.PATH}" diff --git a/ci/Jenkinsfile.tests-imports b/ci/Jenkinsfile.tests-imports index 529131778a..db415b7f7e 100644 --- a/ci/Jenkinsfile.tests-imports +++ b/ci/Jenkinsfile.tests-imports @@ -14,6 +14,11 @@ pipeline { description: 'Level of verbosity based on nimbus-build-system setup.', choices: ['0', '1', '2'] ) + string( + name: 'NIMFLAGS', + description: 'Extra Nim flags. Examples: --verbosity:2 --passL:"-v" --passC:"-v"', + defaultValue: '--colors:off' + ) } options { @@ -36,8 +41,6 @@ pipeline { TARGET = 'tests/imports' /* Improve make performance */ 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.15.2/gcc_64" PATH = "${env.QTDIR}/bin:${env.PATH}" diff --git a/ci/Jenkinsfile.tests-nim b/ci/Jenkinsfile.tests-nim index 4da59d6a6e..9d9f58a5c7 100644 --- a/ci/Jenkinsfile.tests-nim +++ b/ci/Jenkinsfile.tests-nim @@ -17,6 +17,11 @@ pipeline { description: 'Level of verbosity based on nimbus-build-system setup.', choices: ['0', '1', '2'] ) + string( + name: 'NIMFLAGS', + description: 'Extra Nim flags. Examples: --verbosity:2 --passL:"-v" --passC:"-v"', + defaultValue: '--colors:off' + ) } options { @@ -39,8 +44,6 @@ pipeline { TARGET = 'tests/nim' /* Improve make performance */ 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.15.2/gcc_64" /* Include library in order to compile the project */ diff --git a/ci/Jenkinsfile.windows b/ci/Jenkinsfile.windows index 518d51a87a..86fb558148 100644 --- a/ci/Jenkinsfile.windows +++ b/ci/Jenkinsfile.windows @@ -17,6 +17,11 @@ pipeline { description: 'Level of verbosity based on nimbus-build-system setup.', choices: ['0', '1', '2'] ) + string( + name: 'NIMFLAGS', + description: 'Extra Nim flags. Examples: --verbosity:2 --passL:"-v" --passC:"-v"', + defaultValue: '--colors:off' + ) } options { @@ -41,8 +46,6 @@ pipeline { TARGET = "windows/${getArch()}" /* Improve make performance */ MAKEFLAGS = "-j${utils.getProcCount()} V=${params.VERBOSE}" - /* Disable colors in Nim compiler logs */ - NIMFLAGS = '--colors:off' /* Explicitly set the QT version */ QTDIR = "/c/Qt/5.15.2/msvc2019_64" PATH = "${env.QTDIR}/bin:${env.PATH}"