Skip to content

Commit

Permalink
doc: update nodejs/build link to main (#2986)
Browse files Browse the repository at this point in the history
  • Loading branch information
F3n67u authored Jul 12, 2022
1 parent 9b20539 commit 8d1a880
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 29 deletions.
14 changes: 7 additions & 7 deletions ansible/MANUAL_STEPS.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ As root:

The last two steps will show the details of the certificates allowing to see expiry dates.

Example:
Example:

```
Not Before: Jan 22 03:40:05 2020 GMT
Expand Down Expand Up @@ -190,9 +190,9 @@ then manually download and install:
1. Go to https://developer.apple.com/download/all/?q=command with an
Apple Developer account (it does not need to be the Build WG's account)
and find `Command Line Tools for Xcode 11.5`. Click the `View Details`
twisty to reveal the download link and download the
twisty to reveal the download link and download the
`Command_Line_Tools_for_Xcode_11.5.dmg` file.
2. Mount the `.dmg` disk image. This creates
2. Mount the `.dmg` disk image. This creates
`/Volumes/Command Line Developer Tools`
```console
sudo hdiutil attach Command_Line_Tools_for_Xcode_11.5.dmg
Expand All @@ -213,7 +213,7 @@ sudo hdiutil detach /Volumes/Command\ Line\ Developer\ Tools
### Remove en1 network interface

Some libuv/Node.js tests currently fail on AIX with a network interface
containing a link local address. This is being tracked in
containing a link local address. This is being tracked in
https://github.com/nodejs/node/issues/39143. In the meantime the `en1`
interface containing the link local address is removed.
```
Expand Down Expand Up @@ -524,14 +524,14 @@ NFS_BOOT_SERVER_IP:PATH_TO_TFTP_BOOT_EXPORT /boot nfs4 nfsvers=3,rw,noexec,async
After these steps are performed and the Pi's are running, Ansible can be run to finish setup. A reboot is recommended after initial setup to ensure the environment is configured correctly (locale and other settings that are changed).

[Setting up a Windows Host]: https://docs.ansible.com/ansible/latest/user_guide/windows_setup.html
[newer Ansible configuration]: https://github.com/nodejs/build/tree/master/ansible
[stand-alone]: https://github.com/nodejs/build/tree/master/setup/windows
[newer Ansible configuration]: https://github.com/nodejs/build/tree/main/ansible
[stand-alone]: https://github.com/nodejs/build/tree/main/setup/windows

## IBM i

There isn't a system start service on IBMi -- the machine should not be
rebooted, and after ansible is run, jenkins needs to be started with
`jenkins-start.sh`. This will submit the job under the iojs user. If the
`jenkins-start.sh`. This will submit the job under the iojs user. If the
job is already running, the `jenkins-start.sh` script will not start
another job.

Expand Down
2 changes: 1 addition & 1 deletion ansible/www-standalone/tools/metrics/public-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ <h3 id="versions">Versions</h3>
<p>Plot:</p>
<p><a href="./summaries/version.png"><img src="./summaries/version.png"></a></p>
<h2 id="additional-stuff">Additional stuff</h2>
<p>The source of this file along with the various scripts used to generate the data files and graphs can be found in the <a href="https://github.com/nodejs/build">nodejs/build</a> GitHub repository in the <a href="https://github.com/nodejs/build/tree/master/ansible/www-standalone/tools/metrics">ansible/www-standalone/tools/metrics</a> directory. Questions, suggestions and pull requests are welcome in that repository.</p>
<p>The source of this file along with the various scripts used to generate the data files and graphs can be found in the <a href="https://github.com/nodejs/build">nodejs/build</a> GitHub repository in the <a href="https://github.com/nodejs/build/tree/main/ansible/www-standalone/tools/metrics">ansible/www-standalone/tools/metrics</a> directory. Questions, suggestions and pull requests are welcome in that repository.</p>
</div>
</div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion ansible/www-standalone/tools/metrics/public-index.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,6 @@ Plot:

## Additional stuff

The source of this file along with the various scripts used to generate the data files and graphs can be found in the [nodejs/build](https://github.com/nodejs/build) GitHub repository in the [setup/www/tools/metrics](https://github.com/nodejs/build/tree/master/setup/www/tools/metrics) directory. Questions, suggestions and pull requests are welcome in that repository.
The source of this file along with the various scripts used to generate the data files and graphs can be found in the [nodejs/build](https://github.com/nodejs/build) GitHub repository in the [setup/www/tools/metrics](https://github.com/nodejs/build/tree/main/setup/www/tools/metrics) directory. Questions, suggestions and pull requests are welcome in that repository.


14 changes: 7 additions & 7 deletions ansible/www-standalone/tools/promote/check_assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,15 @@ async function execute () {
// No expected asset list available for this line, wut?
if (!expectedAssets) {
console.log(` \u001b[31m\u001b[1m✖\u001b[22m\u001b[39m No expected asset list is available for ${line}, does one need to be created?`)
console.log(` https://github.com/nodejs/build/tree/master/ansible/www-standalone/tools/promote/expected_assets/${line}`)
console.log(` https://github.com/nodejs/build/tree/main/ansible/www-standalone/tools/promote/expected_assets/${line}`)
process.exit(0)
}

// Picked an older release line that did have an expected asset list, better warn
if (expectedLineI !== lineI) {
console.log(` \u001b[33m\u001b[1m⚠\u001b[22m\u001b[39m No expected asset list is available for ${line}, using the list for v${expectedLineI}.x instead`)
console.log(` Should a new list be created for ${line}?`)
console.log(` https://github.com/nodejs/build/tree/master/ansible/www-standalone/tools/promote/expected_assets/${line}`)
console.log(` https://github.com/nodejs/build/tree/main/ansible/www-standalone/tools/promote/expected_assets/${line}`)
}

// generate comparison lists
Expand Down Expand Up @@ -211,7 +211,7 @@ async function execute () {
// do we need to provide final notices?
if (update) {
console.log(` Does the expected assets list for ${line} need to be updated?`)
console.log(` https://github.com/nodejs/build/tree/master/ansible/www-standalone/tools/promote/expected_assets/${line}`)
console.log(` https://github.com/nodejs/build/tree/main/ansible/www-standalone/tools/promote/expected_assets/${line}`)
}
if (caution) {
console.log(' \u001b[33mPromote if you are certain this is the the correct course of action\u001b[39m')
Expand Down Expand Up @@ -397,7 +397,7 @@ function test () {
'... Checking assets\n' +
' \u001b[33m\u001b[1m⚠\u001b[22m\u001b[39m No expected asset list is available for v9.x, using the list for v8.x instead\n' +
' Should a new list be created for v9.x?\n' +
' https://github.com/nodejs/build/tree/master/ansible/www-standalone/tools/promote/expected_assets/v9.x\n' +
' https://github.com/nodejs/build/tree/main/ansible/www-standalone/tools/promote/expected_assets/v9.x\n' +
'... Expecting a total of 44 assets for v9.x\n' +
'... 40 assets waiting in staging\n' +
'... 0 assets already promoted\n' +
Expand Down Expand Up @@ -456,7 +456,7 @@ function test () {
' • ooolaalaa.tar.gz\n' +
' • whatdis.tar.xz\n' +
' Does the expected assets list for v10.x need to be updated?\n' +
' https://github.com/nodejs/build/tree/master/ansible/www-standalone/tools/promote/expected_assets/v10.x\n' +
' https://github.com/nodejs/build/tree/main/ansible/www-standalone/tools/promote/expected_assets/v10.x\n' +
' \u001b[33mPromote if you are certain this is the the correct course of action\u001b[39m\n'

async function setup (fixtureStagingDir, fixtureDistDir) {
Expand Down Expand Up @@ -484,7 +484,7 @@ function test () {
' • docs/bar\n' +
' • docs/foo\n' +
' Does the expected assets list for v11.x need to be updated?\n' +
' https://github.com/nodejs/build/tree/master/ansible/www-standalone/tools/promote/expected_assets/v11.x\n' +
' https://github.com/nodejs/build/tree/main/ansible/www-standalone/tools/promote/expected_assets/v11.x\n' +
' \u001b[33mPromote if you are certain this is the the correct course of action\u001b[39m\n'

async function setup (fixtureStagingDir, fixtureDistDir) {
Expand Down Expand Up @@ -513,7 +513,7 @@ function test () {
' • ooolaalaa.tar.gz\n' +
' • whatdis.tar.xz\n' +
' Does the expected assets list for v6.x need to be updated?\n' +
' https://github.com/nodejs/build/tree/master/ansible/www-standalone/tools/promote/expected_assets/v6.x\n' +
' https://github.com/nodejs/build/tree/main/ansible/www-standalone/tools/promote/expected_assets/v6.x\n' +
' \u001b[33mPromote if you are certain this is the the correct course of action\u001b[39m\n'

async function setup (fixtureStagingDir, fixtureDistDir) {
Expand Down
6 changes: 3 additions & 3 deletions doc/disaster-recovery-plan.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ The [iptables ansible playbook] can also be used to add every known host
in the ansible inventory beginning with `release-` or `test-` prefixes to
the iptables rules for the respective CI server.

[backup server]: https://github.com/nodejs/build/tree/master/backup
[iptables ansible playbook]: https://github.com/nodejs/build/blob/master/ansible/playbooks/jenkins/host/iptables.yml
[Jenkins host playbooks]: https://github.com/nodejs/build/tree/master/ansible/playbooks/jenkins/host
[backup server]: https://github.com/nodejs/build/tree/main/backup
[iptables ansible playbook]: https://github.com/nodejs/build/blob/main/ansible/playbooks/jenkins/host/iptables.yml
[Jenkins host playbooks]: https://github.com/nodejs/build/tree/main/ansible/playbooks/jenkins/host
[Recovering iptables configuration]: #recovering-iptables-configuration
[Recovering Jenkins configuration]: #recovering-jenkins-configuration

2 changes: 1 addition & 1 deletion doc/meetings/build-wg-meeting-2018-06-12.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
* Improve tests
* Can also improve the overall user experience in using the CI
* Next steps
* Jon - working on guide - https://github.com/nodejs/build/blob/master/doc/jenkins-guide.md
* Jon - working on guide - https://github.com/nodejs/build/blob/main/doc/jenkins-guide.md
* volunteers to review the jenkins-guide.md, ask Jon for clarity where necessary
* ask volunteers to join node-build on freenode, start responding to issues
* ask volunteers to start reading through the documentation.
Expand Down
2 changes: 1 addition & 1 deletion doc/meetings/build-wg-meeting-2018-08-14.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
* (P.S. libuv is happy for Centos 5 to be removed https://github.com/libuv/libuv/issues/1935 + https://github.com/libuv/libuv/pull/1940#issuecomment-411744257)
* Use of Docker in Build CI [#1226](https://github.com/nodejs/build/issues/1226)
* Waiting for Michael to be back for walkthrough
* Jon has written a guide for debugging (https://github.com/nodejs/build/blob/master/doc/jenkins-guide.md#fixing-machines-with-docker)
* Jon has written a guide for debugging (https://github.com/nodejs/build/blob/main/doc/jenkins-guide.md#fixing-machines-with-docker)
* Setting `core.autocrlf` on workers to avoid git “autofix” [#1443](https://github.com/nodejs/build/issues/1443)
* Been happening for a while (a file marked as “Modified” breaks rebasing)
* V8 file checked in with CRLF file endings
Expand Down
10 changes: 5 additions & 5 deletions doc/resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ In addition to servers, release has access to:

### nodejs.org

`nodejs.org` is the main website for the Node.js Foundation. Its Ansible configuration lives in [`setup/www`](https://github.com/nodejs/build/tree/master/setup/www)
`nodejs.org` is the main website for the Node.js Foundation. Its Ansible configuration lives in [`setup/www`](https://github.com/nodejs/build/tree/main/setup/www)

### [ci.nodejs.org](https://ci.nodejs.org)

Expand All @@ -149,9 +149,9 @@ cluster:

| Type | Jenkins Agent | Jenkins Workspace | Playbook | Notes |
|---|---|---|---|---|
| "Normal" | On machine | On machine | [`jenkins/worker/create.yml`](https://github.com/nodejs/build/blob/master/ansible/playbooks/jenkins/worker/create.yml) | Run-of-the-mill, most common type of worker |
| "Half Docker" | On machine | Docker container | [`jenkins/worker/create.yml`](https://github.com/nodejs/build/blob/master/ansible/playbooks/jenkins/worker/create.yml) | Raspbery Pi, Scaleway ARM v7 |
| "Full Docker" | Docker container | Docker container | [`jenkins/docker-host.yaml`](https://github.com/nodejs/build/blob/master/ansible/playbooks/jenkins/docker-host.yaml) | Special case Linux machines |
| "Normal" | On machine | On machine | [`jenkins/worker/create.yml`](https://github.com/nodejs/build/blob/main/ansible/playbooks/jenkins/worker/create.yml) | Run-of-the-mill, most common type of worker |
| "Half Docker" | On machine | Docker container | [`jenkins/worker/create.yml`](https://github.com/nodejs/build/blob/main/ansible/playbooks/jenkins/worker/create.yml) | Raspbery Pi, Scaleway ARM v7 |
| "Full Docker" | Docker container | Docker container | [`jenkins/docker-host.yaml`](https://github.com/nodejs/build/blob/main/ansible/playbooks/jenkins/docker-host.yaml) | Special case Linux machines |

[`nodejs-ci-health`](https://nodejs-ci-health.mmarchini.me/),
[`node-build-monitor`](http://node-build-monitor.herokuapp.com/), and
Expand Down Expand Up @@ -185,7 +185,7 @@ jenkins-release-admins membership who do not have infra or release membership.

### [GitHub Bot][]

The `github-bot` is the server that runs different [automation scripts](https://github.com/nodejs/github-bot/tree/HEAD/scripts) within the Node.js Foundation GitHub organization. For example, the bot automatically applies labels to new pull requests in `nodejs/node`, and can trigger Jenkins builds or report their statuses on pull requests. Its Ansible configuration lives in [`playbooks/create-github-bot.yml`](https://github.com/nodejs/build/tree/master/ansible/playbooks/create-github-bot.yml)
The `github-bot` is the server that runs different [automation scripts](https://github.com/nodejs/github-bot/tree/HEAD/scripts) within the Node.js Foundation GitHub organization. For example, the bot automatically applies labels to new pull requests in `nodejs/node`, and can trigger Jenkins builds or report their statuses on pull requests. Its Ansible configuration lives in [`playbooks/create-github-bot.yml`](https://github.com/nodejs/build/tree/main/ansible/playbooks/create-github-bot.yml)

Those with `github-bot` access have access to the GitHub Bot's configuration,
including GitHub and Jenkins secrets. The list of members is
Expand Down
4 changes: 2 additions & 2 deletions jenkins/scripts/VersionSelectorScript.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def buildExclusions = [
[ /^ubuntu1604-arm64/, anyType, gte(14) ],

// Windows -----------------------------------------------
// https://github.com/nodejs/build/blob/master/doc/windows-visualstudio-supported-versions.md
// https://github.com/nodejs/build/blob/main/doc/windows-visualstudio-supported-versions.md
// Release Builders - should only match one VS version per Node.js version
[ /vs2013/, releaseType, gte(6) ],
[ /vs2015/, releaseType, ltGte(6, 10) ],
Expand All @@ -91,7 +91,7 @@ def buildExclusions = [
[ /vs2017-COMPILED_BY/, testType, lt(8) ],
[ /vs2019-COMPILED_BY/, testType, lt(12) ],
// Exclude some redundant configurations
// https://github.com/nodejs/build/blob/master/doc/node-test-commit-matrix.md
// https://github.com/nodejs/build/blob/main/doc/node-test-commit-matrix.md
[ /win10.*COMPILED_BY-vs2017/, testType, lt(10) ], // vcbt2015 runs on win10 for <10
[ /win10.*COMPILED_BY-vs2017/, testType, gte(13) ], // vs2019 runs on win10 for >=13

Expand Down
2 changes: 1 addition & 1 deletion jenkins/scripts/node-test-commit-pre.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ LOCAL_SCRIPT="${WORKSPACE}/build/jenkins/scripts/node-test-commit-diagnostics.sh
if [ -e "${LOCAL_SCRIPT}" ]; then
bash -ex "${LOCAL_SCRIPT}" before
else
curl https://raw.githubusercontent.com/nodejs/build/master/jenkins/scripts/node-test-commit-diagnostics.sh | bash -ex -s before
curl https://raw.githubusercontent.com/nodejs/build/main/jenkins/scripts/node-test-commit-diagnostics.sh | bash -ex -s before
fi

0 comments on commit 8d1a880

Please sign in to comment.