[PATCH v2 2/2] ci: do not skip tagged revisions in GitHub workflows
- From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Oct 8, 2020, 15:29 UTC
- Message-ID
- <931a2b8482dd10b64b506e70539ee1bf9f8cf2e7.1602170976.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.619.v2.git.1602170976.gitgitgadget@gmail.com>
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.
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> --- ci/lib.sh | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/ci/lib.sh b/ci/lib.sh index 3eefec500d..79f81563cb 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
-- gitgitgadget