From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH] fixup??? Merge branch 'ab/ci-updates' into seen
Date: Mon, 22 Nov 2021 11:02:10 +0000 [thread overview]
Message-ID: <pull.1081.git.1637578930464.gitgitgadget@gmail.com> (raw)
From: Johannes Schindelin <johannes.schindelin@gmx.de>
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@gmx.de>
---
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
next reply other threads:[~2021-11-22 11:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 11:02 Johannes Schindelin via GitGitGadget [this message]
2021-11-22 15:57 ` [PATCH] fixup??? Merge branch 'ab/ci-updates' into seen Ævar Arnfjörð Bjarmason
2021-11-22 21:58 ` Johannes Schindelin
2021-11-22 23:12 ` Ævar Arnfjörð Bjarmason
2021-11-23 12:02 ` Johannes Schindelin
2021-11-23 12:18 ` Ævar Arnfjörð Bjarmason
2021-11-23 17:58 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1081.git.1637578930464.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).