summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2020-10-11 21:27:11 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-10-12 12:27:12 -0700
commitd6d668379724c744e5865e9553a2d275bd5c9500 (patch)
tree1e9845e52cf530229c3cfb3d5daf569a3fa4eecd
parentci: work around old records of GitHub runs (diff)
downloadtgif-d6d668379724c744e5865e9553a2d275bd5c9500.tar.xz
ci: make the "skip-if-redundant" check more defensive
In 7d78d5fc1a9 (ci: skip GitHub workflow runs for already-tested commits/trees, 2020-10-08), we added a check that determines whether there is already a workflow run for the given commit (or at least tree), and if found, skips the current run. We just worked around an issue with this check where older runs might unexpectedly miss the `head_commit` attribute. Let's be even more defensive by catching all kinds of exceptions, logging them as warnings, and continue the run without skipping it (after all, if the check fails, we _want_ to continue with the run). This commit is best viewed with the diff option `-w` because it increases the indentation level of the GitHub Action script by two spaces, surrounding it by a `try ... catch` construct. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--.github/workflows/main.yml58
1 files changed, 31 insertions, 27 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d4298878f5..9dc359bc23 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,35 +41,39 @@ jobs:
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
- // Figure out workflow ID, commit and tree
- const { data: run } = await github.actions.getWorkflowRun({
- owner: context.repo.owner,
- repo: context.repo.repo,
- run_id: context.runId,
- });
- const workflow_id = run.workflow_id;
- const head_sha = run.head_sha;
- const tree_id = run.head_commit.tree_id;
+ try {
+ // Figure out workflow ID, commit and tree
+ const { data: run } = await github.actions.getWorkflowRun({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ run_id: context.runId,
+ });
+ const workflow_id = run.workflow_id;
+ const head_sha = run.head_sha;
+ const tree_id = run.head_commit.tree_id;
- // See whether there is a successful run for that commit or tree
- const { data: runs } = await github.actions.listWorkflowRuns({
- owner: context.repo.owner,
- repo: context.repo.repo,
- per_page: 500,
- status: 'success',
- workflow_id,
- });
- for (const run of runs.workflow_runs) {
- if (head_sha === run.head_sha) {
- core.warning(`Successful run for the commit ${head_sha}: ${run.html_url}`);
- core.setOutput('enabled', ' but skip');
- break;
- }
- if (run.head_commit && tree_id === run.head_commit.tree_id) {
- core.warning(`Successful run for the tree ${tree_id}: ${run.html_url}`);
- core.setOutput('enabled', ' but skip');
- break;
+ // See whether there is a successful run for that commit or tree
+ const { data: runs } = await github.actions.listWorkflowRuns({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ per_page: 500,
+ status: 'success',
+ workflow_id,
+ });
+ for (const run of runs.workflow_runs) {
+ if (head_sha === run.head_sha) {
+ core.warning(`Successful run for the commit ${head_sha}: ${run.html_url}`);
+ core.setOutput('enabled', ' but skip');
+ break;
+ }
+ if (run.head_commit && tree_id === run.head_commit.tree_id) {
+ core.warning(`Successful run for the tree ${tree_id}: ${run.html_url}`);
+ core.setOutput('enabled', ' but skip');
+ break;
+ }
}
+ } catch (e) {
+ core.warning(e);
}
windows-build: