tweak branch name logic

AdrianGonz97 · May 16, 2024 · 543e6c9 · 543e6c9
1 parent 5594171
commit 543e6c9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -26518,7 +26518,7 @@ async function getPagesProject() {
 }
 async function createPagesDeployment(isProd) {
   const branch = config.branch || githubBranch;
-  const branchName = isProd || config.branch || prBranchOwner === void 0 ? branch : `${prBranchOwner}-${branch}`;
+  const branchName = config.branch ? config.branch : isProd || prBranchOwner === void 0 ? branch : `${prBranchOwner}-${branch}`;
   await src_default.in(import_node_path.default.join(process.cwd(), config.workingDirectory))`
 $ export CLOUDFLARE_API_TOKEN="${config.apiToken}"
 if ${config.accountId} {

diff --git a/src/cloudflare.ts b/src/cloudflare.ts
@@ -29,8 +29,12 @@ export async function getPagesProject() {
 
 export async function createPagesDeployment(isProd: boolean) {
 	const branch = config.branch || githubBranch;
-	const branchName =
-		isProd || config.branch || prBranchOwner === undefined ? branch : `${prBranchOwner}-${branch}`;
+	// use `config.branch` if it's set, otherwise, infer the name
+	const branchName = config.branch
+		? config.branch
+		: isProd || prBranchOwner === undefined
+			? branch
+			: `${prBranchOwner}-${branch}`;
 
 	// TODO: Replace this with an API call to wrangler so we can get back a full deployment response object
 	await shellac.in(path.join(process.cwd(), config.workingDirectory))`