mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: publish-to-npm respects main (#29375)

Browse source
This commit is contained in:
Jeremy Rose 2021-05-28 12:13:12 -07:00 • committed by GitHub
commit a61f1446bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
script/release/publish-to-npm.js
View file

@ -111,8 +111,9 @@ new Promise((resolve, reject) => {
const currentBranch = await getCurrentBranch();
if (release.tag_name.indexOf('nightly') > 0) {
if (currentBranch === 'master') {
// Nightlies get published to their own module, so master nightlies should be tagged as latest
// TODO(main-migration): Simplify once main branch is renamed.
if (currentBranch === 'master' || currentBranch === 'main') {
// Nightlies get published to their own module, so they should be tagged as latest
npmTag = 'latest';
} else {
npmTag = `nightly-${currentBranch}`;
@ -127,10 +128,10 @@ new Promise((resolve, reject) => {
JSON.stringify(currentJson, null, 2)
);
} else {
if (currentBranch === 'master') {
// This should never happen, master releases should be nightly releases
if (currentBranch === 'master' || currentBranch === 'main') {
// This should never happen, main releases should be nightly releases
// this is here just-in-case
npmTag = 'master';
throw new Error('Unreachable release phase, can\'t tag a non-nightly release on the main branch');
} else if (!release.prerelease) {
// Tag the release with a `2-0-x` style tag
npmTag = currentBranch;