From fdc6a96d493407471bf4b1fee759b624080327d5 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Fri, 26 Feb 2021 05:47:38 -0800 Subject: [PATCH] doc: revise CI text in collaborator guide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Minor clarifications to text. For example, this moves the "(green or yellow)" parenthetical closer to the text to which it applies. (It applies only to Jenkins CI.) PR-URL: https://github.com/nodejs/node/pull/37526 Reviewed-By: Antoine du Hamel Reviewed-By: Richard Lau Reviewed-By: Beth Griggs Reviewed-By: Benjamin Gruenbaum Reviewed-By: Darshan Sen Reviewed-By: Gerhard Stöbich --- doc/guides/collaborator-guide.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/guides/collaborator-guide.md b/doc/guides/collaborator-guide.md index 24c3478a079408..c596c655118c68 100644 --- a/doc/guides/collaborator-guide.md +++ b/doc/guides/collaborator-guide.md @@ -210,11 +210,11 @@ the comment anyway to avoid any doubt. All fixes must have a test case which demonstrates the defect. The test should fail before the change, and pass after the change. -Do not land any pull requests without a passing (green or yellow) CI run. -A green GitHub Actions CI result is required. A passing -[Jenkins CI](https://ci.nodejs.org/) is also required if PR contains changes -that will affect the `node` binary. This is critical as GitHub Actions CI does -not cover all the environments supported by Node.js. +Do not land any pull requests without the necessary passing CI runs. +A passing (green) GitHub Actions CI result is required. A passing (green or +yellow) [Jenkins CI](https://ci.nodejs.org/) is also required if the pull +request contains changes that will affect the `node` binary. This is because +GitHub Actions CI does not cover all the environments supported by Node.js.
Changes that affect the `node` binary @@ -295,7 +295,7 @@ in the form: To specify the branch this way, `refs/heads/BRANCH` is used (e.g. for `master` -> `refs/heads/master`). For pull requests, it will look like `refs/pull/PR_NUMBER/head` -(e.g. for PR#42 -> `refs/pull/42/head`). +(e.g. for pull request #42 -> `refs/pull/42/head`). * `REBASE_ONTO`: Change that to `origin/master` so the pull request gets rebased onto master. This can especially be important for pull requests that have been open a while.