[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 2/6] gitlab-ci: Adapt JOBS variable for FreeBSD runners
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[PATCH v3 2/6] gitlab-ci: Adapt JOBS variable for FreeBSD runners |
|
Date: |
Wed, 19 May 2021 20:45:45 +0200 |
'nproc' is not available on FreeBSD:
$ JOBS=$(expr $(nproc) + 1)
bash: line 119: nproc: command not found
expr: syntax error
Instead, use 'sysctl -n hw.ncpu'.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
.gitlab-ci.d/buildtest-template.yml | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.d/buildtest-template.yml
b/.gitlab-ci.d/buildtest-template.yml
index 58b01744751..fe4f18595ac 100644
--- a/.gitlab-ci.d/buildtest-template.yml
+++ b/.gitlab-ci.d/buildtest-template.yml
@@ -1,6 +1,16 @@
.environment_variables_template:
before_script:
- - JOBS=$(expr $(nproc) + 1)
+ - if
+ test $(uname) = "FreeBSD"
+ ;
+ then
+ JOBS=$(sysctl -n hw.ncpu)
+ ;
+ else
+ JOBS=$(expr $(nproc) + 1)
+ ;
+ fi
+ - echo "=== Using $JOBS simultaneous jobs ==="
.native_build_job_template:
stage: build
--
2.26.3