Skip to content

Use 'main' instead of 'master' #170

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 5, 2021
Merged

Use 'main' instead of 'master' #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 scripts/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const originalUrl = `https://github.com/${owner}/${repository}.git`;

const newRepoName = `${langCode}.${repository}`;
const newRepoUrl = `https://github.com/${owner}/${newRepoName}.git`;
const defaultBranch = 'master';
const defaultBranch = 'main';

const token = process.env.GITHUB_ADMIN_ACCESS_TOKEN;
const octokit = new Octokit({
Expand Down
14 changes: 7 additions & 7 deletions scripts/sync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const username = process.env.USER_NAME;
const token = process.env.GITHUB_ACCESS_TOKEN;
const transRepoName = `${langCode}.${repository}`;
const transUrl = `https://${username}:${token}@github.com/${owner}/${transRepoName}.git`;
const defaultBranch = 'master';
const defaultBranch = 'main';

function teardownAndExit() {
if (program.delete) {
Expand Down Expand Up @@ -74,7 +74,7 @@ if (shell.exec(`git checkout ${syncBranch}`).code !== 0) {
shell.exec(`git checkout -b ${syncBranch}`);
}

// Pull from {source}/master
// Pull from {source}/main
const output = shell.exec(`git pull ${repository} ${defaultBranch}`).stdout;
if (output.includes('Already up to date.')) {
logger.info(`We are already up to date with ${repository}.`);
Expand All @@ -90,9 +90,9 @@ const conflictFiles = conflictLines.map(line =>

shell.exec(`git commit -am "merging all conflicts"`);

// If no conflicts, merge directly into master
// If no conflicts, merge directly into main
if (conflictFiles.length === 0) {
logger.info('No conflicts found. Committing directly to master.');
logger.info('No conflicts found. Committing directly to main.');
shell.exec(`git checkout ${defaultBranch}`);
shell.exec(`git merge ${syncBranch}`);
shell.exec(`git push origin ${defaultBranch}`);
Expand All @@ -112,7 +112,7 @@ The following files have conflicts and may need new translations:
${conflictFiles
.map(
file =>
` * [ ] [${file}](/${owner}/${repository}/commits/master/${file})`,
` * [ ] [${file}](/${owner}/${repository}/commits/main/${file})`,
)
.join('\n')}

Expand All @@ -122,13 +122,13 @@ Please fix the conflicts by pushing new commits to this pull request, either by
const body = `
This PR was automatically generated.

Merge changes from [reactjs.org](https://github.com/reactjs/reactjs.org/commits/master) at ${shortHash}
Merge changes from [reactjs.org](https://github.com/reactjs/reactjs.org/commits/main) at ${shortHash}

${conflictFiles.length > 0 ? conflictsText : 'No conflicts were found.'}

## DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from master and cause them to show up as conflicts the next time we merge.
Doing so will "erase" the commits from main and cause them to show up as conflicts the next time we merge.
`;

// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/random#Getting_a_random_integer_between_two_values
Expand Down