From 1b7d316dcf2c5cafb2791384269c8f5718319eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20Arboleda?= Date: Mon, 27 Apr 2020 14:37:10 -0500 Subject: [PATCH 1/2] doc: clarify when not to run CI on docs Collaborators won't need to run CI on documentation-only changes. --- doc/guides/collaborator-guide.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/guides/collaborator-guide.md b/doc/guides/collaborator-guide.md index c08834ea4a1352..e5de45c0a43285 100644 --- a/doc/guides/collaborator-guide.md +++ b/doc/guides/collaborator-guide.md @@ -177,8 +177,9 @@ All pull requests must pass continuous integration tests. Code changes must pass on [project CI server](https://ci.nodejs.org/). Pull requests that only change documentation and comments can use GitHub Actions results. -Do not land any pull requests without passing (green or yellow) CI runs. If -there are CI failures unrelated to the change in the pull request, try "Resume +Do not land any pull requests without passing (green or yellow) CI runs (except +for documentation-only changes, with green GitHub actions is enough). If there +are CI failures unrelated to the change in the pull request, try "Resume Build". It is in the left navigation of the relevant `node-test-pull-request` job. It will preserve all the green results from the current job but re-run everything else. Start a fresh CI if more than seven days have elapsed since From cfea0635b32bcab131d1cb7a0b6df0c173930a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20Arboleda?= Date: Wed, 29 Apr 2020 11:19:35 -0500 Subject: [PATCH 2/2] fixup --- doc/guides/collaborator-guide.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/guides/collaborator-guide.md b/doc/guides/collaborator-guide.md index e5de45c0a43285..128f06857b8f0a 100644 --- a/doc/guides/collaborator-guide.md +++ b/doc/guides/collaborator-guide.md @@ -177,9 +177,10 @@ All pull requests must pass continuous integration tests. Code changes must pass on [project CI server](https://ci.nodejs.org/). Pull requests that only change documentation and comments can use GitHub Actions results. -Do not land any pull requests without passing (green or yellow) CI runs (except -for documentation-only changes, with green GitHub actions is enough). If there -are CI failures unrelated to the change in the pull request, try "Resume +Do not land any pull requests without a passing (green or yellow) CI run. +For documentation-only changes, GitHub Actions CI is sufficient. +For all other code changes, Jenkins CI must pass as well. If there are +Jenkins CI failures unrelated to the change in the pull request, try "Resume Build". It is in the left navigation of the relevant `node-test-pull-request` job. It will preserve all the green results from the current job but re-run everything else. Start a fresh CI if more than seven days have elapsed since