summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-10-30 13:04:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-10-30 13:04:24 -0700
commit876511ef6146338fa2ac94e21f122610b60ab78d (patch)
tree2119440182475ffc7433450dc4fe211aca9e8585
parentMerge branch 'dl/resurrect-update-for-sha256' (diff)
parentci: make the "skip-if-redundant" check more defensive (diff)
downloadtgif-876511ef6146338fa2ac94e21f122610b60ab78d.tar.xz
Merge branch 'js/ci-ghwf-dedup-tests'
GitHub Actions automated test improvement to skip tests on a tree identical to what has already been tested. * js/ci-ghwf-dedup-tests: ci: make the "skip-if-redundant" check more defensive ci: work around old records of GitHub runs
-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 a940997f1b..6c3453a10b 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 (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: