Skip to content

Commit

Permalink
refactor: publish-to-npm respects main (#29406)
Browse files Browse the repository at this point in the history
  • Loading branch information
trop[bot] committed May 31, 2021
1 parent b4131bb commit b4757c7
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions script/release/publish-to-npm.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}`;
Expand All @@ -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;
Expand Down

0 comments on commit b4757c7

Please sign in to comment.