Skip to content

Commit 4463ce7

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7d78d5f commit 4463ce7

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

ci/lib.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ then
149149
CI_REPO_SLUG="$GITHUB_REPOSITORY"
150150
CI_JOB_ID="$GITHUB_RUN_ID"
151151
CC="${CC:-gcc}"
152+
DONT_SKIP_TAGS=t
152153

153154
cache_dir="$HOME/none"
154155

@@ -167,6 +168,7 @@ good_trees_file="$cache_dir/good-trees"
167168

168169
mkdir -p "$cache_dir"
169170

171+
test -n "${DONT_SKIP_TAGS-}" ||
170172
skip_branch_tip_with_tag
171173
skip_good_tree
172174

0 commit comments

Comments
 (0)