diff --git a/Makefile b/Makefile index 2980e8b341..8e6d4fd836 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,8 @@ BUILD_SYSTEM_DIR := vendor/nimbus-build-system ifeq ($(NIM_PARAMS),) # "variables.mk" was not included, so we update the submodules. -GIT_SUBMODULE_UPDATE := git submodule update --init --recursive +NUMPROC ?= 10 +GIT_SUBMODULE_UPDATE := git submodule update --init --recursive --jobs $(NUMPROC) .DEFAULT: +@ echo -e "Git submodules not found. Running '$(GIT_SUBMODULE_UPDATE)'.\n"; \ $(GIT_SUBMODULE_UPDATE); \ diff --git a/ci/Jenkinsfile.windows b/ci/Jenkinsfile.windows index 86b98b74ba..ed64b36649 100644 --- a/ci/Jenkinsfile.windows +++ b/ci/Jenkinsfile.windows @@ -5,7 +5,7 @@ library 'status-jenkins-lib@v1.9.7' def isPRBuild = utils.isPRBuild() pipeline { - agent { label 'windows && x86_64 && qt-5.15.2 && go-1.21' } + agent { label 'windows && x86_64 && qt-5.15.2 && go-1.21 && win-04' } parameters { booleanParam( @@ -66,8 +66,10 @@ pipeline { environment { PLATFORM = "windows/${getArch()}" + /* Number of processors on the host*/ + NUMPROC = "${sh(script: 'nproc', returnStdout: true).trim()}" /* Improve make performance */ - MAKEFLAGS = "-j${utils.getProcCount()} V=${params.VERBOSE}" + MAKEFLAGS = "-j${env.NUMPROC} V=${params.VERBOSE}" /* Explicitly set the QT version */ QTDIR = "/c/Qt/5.15.2/msvc2019_64" PATH = "${env.QTDIR}/bin:${env.PATH}"