summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2020-10-08 15:29:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-10-08 18:58:41 (GMT)
commit4463ce75b7eea47f9b484b05957def655d3f46d5 (patch)
tree6beaa654bacaac710b0d1280d010f820a51490be
parent7d78d5fc1a91b683dde970e5e48b6d9a873cfd99 (diff)
downloadgit-4463ce75b7eea47f9b484b05957def655d3f46d5.zip
git-4463ce75b7eea47f9b484b05957def655d3f46d5.tar.gz
git-4463ce75b7eea47f9b484b05957def655d3f46d5.tar.bz2
ci: do not skip tagged revisions in GitHub workflows
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. Our GitHub workflow is also triggered by tags. However, the run would fail because the `windows-test` jobs are _not_ skipped on tags, but the `windows-build` job _is skipped (and therefore fails to upload the build artifacts needed by the test jobs). In addition, we just added logic to our GitHub workflow that will skip runs altogether if there is already a successful run for the same commit or at least for the same tree. Let's just change the GitHub workflow to no longer specifically skip tagged revisions. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xci/lib.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/ci/lib.sh b/ci/lib.sh
index 821e366..38c0eac 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -149,6 +149,7 @@ then
CI_REPO_SLUG="$GITHUB_REPOSITORY"
CI_JOB_ID="$GITHUB_RUN_ID"
CC="${CC:-gcc}"
+ DONT_SKIP_TAGS=t
cache_dir="$HOME/none"
@@ -167,6 +168,7 @@ good_trees_file="$cache_dir/good-trees"
mkdir -p "$cache_dir"
+test -n "${DONT_SKIP_TAGS-}" ||
skip_branch_tip_with_tag
skip_good_tree