summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml3
-rwxr-xr-x.gitlab/ci.sh6
2 files changed, 9 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d6c3099889..f0f38d0ddb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -848,6 +848,9 @@ validate-x86_64-linux-deb10-debug:
TEST_ENV: "x86_64-linux-deb10-debug"
BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb10-linux-debug.tar.xz"
HADDOCK_HYPERLINKED_SOURCES: "yes"
+ # Numa enabled for this build so at least one build tests the libnuma build.
+ # It could be any job but luckily for deb10-debug, I choose it.
+ ENABLE_NUMA: 1
artifacts:
when: always
expire_in: 2 week
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index c30f5ec846..d85a4e0b4f 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -70,6 +70,7 @@ Environment variables affecting both build systems:
"decreases", or "all")
HERMETIC Take measures to avoid looking at anything in \$HOME
CONFIGURE_ARGS Arguments passed to configure script.
+ ENABLE_NUMA Whether to enable numa support for the build (disabled by default)
INSTALL_CONFIGURE_ARGS
Arguments passed to the binary distribution configure script
during installation of test toolchain.
@@ -404,6 +405,11 @@ function configure() {
if [[ -n "${target_triple:-}" ]]; then
args+=("--target=$target_triple")
fi
+ if [[ -n "${ENABLE_NUMA:-}" ]]; then
+ args+=("--enable-numa")
+ else
+ args+=("--disable-numa")
+ fi
start_section "configuring"
# See https://stackoverflow.com/questions/7577052 for a rationale for the