Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update default branch to main #2987

Merged
merged 1 commit into from
Nov 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/roles/awx/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
command: tower-cli team create --name {{ awx_org }} --organization {{ awx_org }}

- name: add nodejs/build repo to AWX
command: tower-cli project create --organization {{ awx_org }} --name nodejs/build --scm-type git --scm-url https://github.com/nodejs/build --scm-branch master --scm-update-on-launch true
command: tower-cli project create --organization {{ awx_org }} --name nodejs/build --scm-type git --scm-url https://github.com/nodejs/build --scm-branch main --scm-update-on-launch true

- name: create inventory
command: tower-cli inventory create --organization {{ awx_org }} --name nodejs_inventory_github
Expand Down
2 changes: 1 addition & 1 deletion doc/node-test-commit-matrix.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ The following combinations are used:

- Machines for "Test Only" don't build Node.js, but are still used to build add-ons so Visual Studio is necessary.
- Machines in Rackspace have more capacity, so avoid building on Azure, at least the current Node.js version.
- Optimize resources for the current Node.js master.
- Optimize resources for the current Node.js main.
- Ensure Node.js LTS versions have full coverage, even if with possible bottlenecks in certain versions.

### Jenkins Labels
Expand Down
2 changes: 1 addition & 1 deletion jenkins/pipelines/http-parser-test.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pipeline {
parameters {
booleanParam(name: 'CERTIFY_SAFE', defaultValue: false, description: 'I have reviewed *the latest version of* these changes and I am sure that they don’t contain any code that could compromise the security of the CI infrastructure.')
string(name: 'PR_ID', defaultValue: "", description: 'The numeric ID of the pull request (from GitHub URL)')
string(name: 'BRANCH', defaultValue: 'master', description: 'Git branch to use for testing (ignore this value for PRs)')
string(name: 'BRANCH', defaultValue: 'main', description: 'Git branch to use for testing (ignore this value for PRs)')
}

stages {
Expand Down
2 changes: 1 addition & 1 deletion jenkins/pipelines/llnode-pipeline.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
properties([
parameters([
string(name: 'GIT_REPO', defaultValue: 'nodejs/llnode', description: 'Fetch from this repo (e.g. gibfahn/llnode)'),
string(name: 'GIT_BRANCH', defaultValue: 'master', description: 'Branch to test (e.g. master, refs/pull/999/head).'),
string(name: 'GIT_BRANCH', defaultValue: 'main', description: 'Branch to test (e.g. main, refs/pull/999/head).'),
string(name: 'NODE_VERSIONS', defaultValue: 'v6 v8 v9 v10 nightly canary', description: 'Space separated list of NODE_VERSIONS to pass to llnode-continuous-integration.'),
string(name: 'LLDB_VERSIONS', defaultValue: '3.9 4.0 5.0 6.0', description: 'Space separated list of LLDB_VERSIONS to pass to llnode-continuous-integration.'),
string(name: 'MACHINES', defaultValue: 'all', description: '''Can be "all" or a space-separated list of nodes, eg:
Expand Down
4 changes: 2 additions & 2 deletions jenkins/pipelines/node-linter.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pipeline {
parameters{
string(name: 'GITHUB_ORG', defaultValue: 'nodejs', description: 'The user/org of the GitHub repo')
string(name: 'REPO_NAME', defaultValue: 'node', description: 'The name of the repo')
string(name: 'GIT_REMOTE_REF', defaultValue: 'refs/heads/master', description: 'The remote portion of the Git refspec to fetch and test')
string(name: 'GIT_REMOTE_REF', defaultValue: 'refs/heads/main', description: 'The remote portion of the Git refspec to fetch and test')
}

stages {
Expand All @@ -26,7 +26,7 @@ pipeline {

stage('Pre-flight') {
steps {
sh "curl -L -s https://raw.githubusercontent.com/nodejs/build/master/jenkins/scripts/node-test-commit-pre.sh -s | bash -xe"
sh "curl -L -s https://raw.githubusercontent.com/nodejs/build/main/jenkins/scripts/node-test-commit-pre.sh -s | bash -xe"
sendBuildStatus("pending", env)
checkMake()
// Make sure we have a node binary in the path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def getBranchName(params) {
if (params.PR_ID) {
return "refs/pull/${params.PR_ID}/head"
} else {
return "refs/heads/master"
return "refs/heads/main"
}
}

Expand Down
2 changes: 1 addition & 1 deletion jenkins/scripts/common/getNode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ helpText="Download the node binary for your machine from nodejs.org.
${CYAN}USAGE:${NC}
$0 8.9.1

8.9.0 $sep Node to download (8.9.0, master, 8, 8.9.0-nightly, latest, 6.2.)
8.9.0 $sep Node to download (8.9.0, main, 8, 8.9.0-nightly, latest, 6.2.)
Inexact values get most recent from range."

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion jenkins/scripts/coverage/generate-index-html.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
Nightly combined JavaScript coverage for Windows and Linux can be found
on <a href="https://codecov.io/gh/nodejs/node">codecov.io</a>:
<a href="https://codecov.io/gh/nodejs/node">
<img id="badge" src="https://codecov.io/gh/nodejs/node/branch/master/graph/badge.svg" alt="Combined coverage" width="112" height="20">
<img id="badge" src="https://codecov.io/gh/nodejs/node/branch/main/graph/badge.svg" alt="Combined coverage" width="112" height="20">
</a>
<h3>
Nightly Linux Branch Coverage&nbsp;&nbsp;<a href="https://github.com/nodejs/node">&rarr;</a>
Expand Down
4 changes: 2 additions & 2 deletions jenkins/xml/citgm-smoker.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@
examples:
refs/heads/:branch |
refs/pull/:pr-number/head</description>
<defaultValue>refs/heads/master</defaultValue>
<defaultValue>refs/heads/main</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>REBASE_ONTO</name>
<description>Optionally, rebase onto the given ref before testing. Leave blank to skip rebasing. |
examples:
origin/master</description>
origin/main</description>
<defaultValue></defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
Expand Down