Skip to content

Commit 4174798

Browse files
authored
Merge pull request #641 from salesforcecli/cd/gh-fix-base-field
fix(rc): set `base` to `main` when creating a PR
2 parents beb276f + e6d414c commit 4174798

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/commands/cli/release/build.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,11 @@ export default class build extends SfCommand<void> {
181181
const prereleaseDetails =
182182
'\n**IMPORTANT:**\nPrereleases work differently than regular releases. Github Actions watches for branches prefixed with `prerelease/`. As long as the `package.json` contains a valid "prerelease tag" (1.2.3-dev.0), a new prerelease will be created for EVERY COMMIT pushed to that branch. If you would like to merge this PR into `main`, simply push one more commit to this branch that sets the version in the `package.json` to the version you\'d like to release.';
183183

184-
// If it is a patch, we will set the PR base to the prefixed branch we pushed earlier
185-
// The Github Action will watch the `patch/` prefix for changes
186-
const base = flags.patch ? `${branchName}` : 'main';
187-
188184
await octokit.request(`POST /repos/${repoOwner}/${repoName}/pulls`, {
189185
owner: repoOwner,
190186
repo: repoName,
191187
head: nextVersion,
192-
base,
188+
base: 'main',
193189
title: `Release PR for ${nextVersion}`,
194190
body: `Building ${nextVersion} [skip-validate-pr]${flags.prerelease ? prereleaseDetails : ''}`,
195191
});

0 commit comments

Comments
 (0)