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] ci: fix GitHub workflow when on a tagged revision
Date: Fri, 24 Apr 2020 17:17:40 +0000 [thread overview]
Message-ID: <pull.619.git.1587748660308.gitgitgadget@gmail.com> (raw)
From: Johannes Schindelin <johannes.schindelin@gmx.de>
When `master` is tagged, and then both `master` and the tag are pushed,
Travis CI will happily build both. That is a waste of energy, which is
why we skip the build for `master` in that case.
However, our GitHub workflow does not trigger on tags, therefore, this
logic results in a missing build for that revision.
Even worse: the run would _fail_ because we would skip the Windows
build, there are no artifacts to publish, and therefore no artifacts to
download in the Windows test jobs.
Let's just change the GitHub workflow to skip the logic to skip
revisions that are tagged.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Do not skip tagged revisions in the GitHub workflow runs
I noticed a failure in the run for Git for Windows v2.26.2 which was
caused by this.
This patch is based on dd/ci-swap-azure-pipelines-with-github-actions.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-619%2Fdscho%2Fgithub-workflows-and-tags-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-619/dscho/github-workflows-and-tags-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/619
ci/lib.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ci/lib.sh b/ci/lib.sh
index dac36886e37..f151e2f0ecb 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -1,6 +1,7 @@
# Library of functions shared by all CI scripts
skip_branch_tip_with_tag () {
+ test -z "$DONT_SKIP_TAGS" || return 0
# Sometimes, a branch is pushed at the same time the tag that points
# at the same commit as the tip of the branch is pushed, and building
# both at the same time is a waste.
@@ -151,6 +152,7 @@ then
CC="${CC:-gcc}"
cache_dir="$HOME/none"
+ DONT_SKIP_TAGS=t
export GIT_PROVE_OPTS="--timer --jobs 10"
export GIT_TEST_OPTS="--verbose-log -x"
base-commit: f72f328bc57e1b0db380ef76e0c1e94a9ed0ac7c
--
gitgitgadget
next reply other threads:[~2020-04-24 17:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 17:17 Johannes Schindelin via GitGitGadget [this message]
2020-04-24 20:50 ` [PATCH] ci: fix GitHub workflow when on a tagged revision Junio C Hamano
2020-04-24 21:12 ` Johannes Schindelin
2020-04-24 21:24 ` Junio C Hamano
2020-10-08 15:29 ` [PATCH v2 0/2] Do not skip tagged revisions in the GitHub workflow runs Johannes Schindelin via GitGitGadget
2020-10-08 15:29 ` [PATCH v2 1/2] ci: skip GitHub workflow runs for already-tested commits/trees Johannes Schindelin via GitGitGadget
2020-10-09 7:29 ` SZEDER Gábor
2020-10-09 11:13 ` Johannes Schindelin
2020-10-10 7:25 ` SZEDER Gábor
2020-10-11 10:28 ` Johannes Schindelin
2020-10-12 16:12 ` Junio C Hamano
2020-10-12 18:57 ` Johannes Schindelin
2020-10-15 17:17 ` Junio C Hamano
2020-10-15 19:39 ` Johannes Schindelin
2020-10-08 15:29 ` [PATCH v2 2/2] ci: do not skip tagged revisions in GitHub workflows Johannes Schindelin via GitGitGadget
2020-10-08 21:11 ` [PATCH v2 0/2] Do not skip tagged revisions in the GitHub workflow runs 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.619.git.1587748660308.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).