From: Johannes Schindelin <johannes.schindelin@xxxxxx> The merge of the `ab/ci-updates` patches needs this fix-up to avoid breaking the Scalar tests. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- fixup??? Merge branch 'ab/ci-updates' into seen This fixes the CI breakage introduced with ab/ci-updates. It is based on the current version of seen: 89513b853be (Merge branch 'en/keep-cwd' into seen, 2021-11-21). Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1081%2Fdscho%2Ffix-ci-updates-merge-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1081/dscho/fix-ci-updates-merge-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/1081 ci/run-build-and-tests.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh index c0bae709b3b..c508c18ad44 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -45,9 +45,8 @@ linux-gcc-4.8) export MAKE_TARGETS=all ;; esac -make -C contrib/scalar test - make $MAKE_TARGETS +make -C contrib/scalar test check_unignored_build_artifacts base-commit: 89513b853be400c439e19e479ed14e9e8de44722 -- gitgitgadget