Merge pull request #23024 from storybookjs/fix-freeze-logic

Release: Fix branch name in isPrFrozen
storybookjs · Jun 12, 2023 · 595b23a · 595b23a
2 parents a40fac3 + 370df47
commit 595b23a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scripts/release/__tests__/is-pr-frozen.test.ts b/scripts/release/__tests__/is-pr-frozen.test.ts
@@ -43,7 +43,7 @@ describe('isPrFrozen', () => {
     });
     await isPrFrozen({ patch: true });
 
-    expect(simpleGit.__fetch).toHaveBeenCalledWith('origin', 'version-from-patch-1.0.0', {
+    expect(simpleGit.__fetch).toHaveBeenCalledWith('origin', 'version-patch-from-1.0.0', {
       '--depth': 1,
     });
   });
@@ -54,7 +54,7 @@ describe('isPrFrozen', () => {
     });
     await isPrFrozen({ patch: false });
 
-    expect(simpleGit.__fetch).toHaveBeenCalledWith('origin', 'version-from-prerelease-1.0.0', {
+    expect(simpleGit.__fetch).toHaveBeenCalledWith('origin', 'version-prerelease-from-1.0.0', {
       '--depth': 1,
     });
   });

diff --git a/scripts/release/is-pr-frozen.ts b/scripts/release/is-pr-frozen.ts
@@ -48,7 +48,7 @@ export const run = async (options: unknown) => {
   const { verbose, patch } = options as { verbose?: boolean; patch?: boolean };
 
   const version = await getCurrentVersion();
-  const branch = `version-from-${patch ? 'patch' : 'prerelease'}-${version}`;
+  const branch = `version-${patch ? 'patch' : 'prerelease'}-from-${version}`;
 
   console.log(`💬 Determining if pull request from branch '${chalk.blue(branch)}' is frozen`);