From ea7a305a45d1332518cbae5041bf63a04a47555e Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 9 May 2019 13:34:42 +0200 Subject: [PATCH] squash! ci: also test with MS Visual C on Azure Pipelines We specifically reduce the number of parallel links for MSVC, as RAM usage is an issue with MSVC's parallel mode, manifested in the symptom: fatal error LNK1318: Unexpected PDB error; OK (0) '' Signed-off-by: Johannes Schindelin --- ci/lib.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index 93a5cba811..471da63cd3 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -116,10 +116,12 @@ then CI_OS_NAME="$(echo "$AGENT_OS" | tr A-Z a-z)" test darwin != "$CI_OS_NAME" || CI_OS_NAME=osx CI_REPO_SLUG="$(expr "$BUILD_REPOSITORY_URI" : '.*/\([^/]*/[^/]*\)$')" + jobs=10 if test -n "$MSVC" then CC=compat/vcbuild/scripts/clink.pl jobname=windows-msvc + jobs=4 fi CC="${CC:-gcc}" @@ -132,9 +134,9 @@ then } BREW_INSTALL_PACKAGES=gcc@8 - export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save" + export GIT_PROVE_OPTS="--timer --jobs $jobs --state=failed,slow,save" export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml" - MAKEFLAGS="$MAKEFLAGS --jobs=10" + MAKEFLAGS="$MAKEFLAGS --jobs=$jobs" test windows_nt != "$CI_OS_NAME" || GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS" else