Support ownerName prefix in --branch-name flag.

chromaui · Jan 12, 2021 · 1c178ad · 1c178ad
1 parent d847727
commit 1c178ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/bin/lib/getOptions.js b/bin/lib/getOptions.js
@@ -24,6 +24,7 @@ const resolveHomeDir = (filepath) =>
 export default async function getOptions({ argv, env, flags, log, packageJson }) {
   const fromCI = !!flags.ci || !!process.env.CI;
   const [patchHeadRef, patchBaseRef] = (flags.patchBuild || '').split('...').filter(Boolean);
+  const [branchName, ownerName] = (flags.branchName || '').split(':').reverse();
 
   const options = {
     projectToken: takeLast(flags.projectToken || flags.appCode) || env.CHROMATIC_PROJECT_TOKEN, // backwards compatibility
@@ -64,7 +65,8 @@ export default async function getOptions({ argv, env, flags, log, packageJson })
       : undefined,
     createTunnel: !flags.storybookUrl && env.CHROMATIC_CREATE_TUNNEL !== 'false',
 
-    branchName: flags.branchName,
+    ownerName,
+    branchName,
     patchHeadRef,
     patchBaseRef,
   };

diff --git a/bin/lib/parseArgs.js b/bin/lib/parseArgs.js
@@ -17,7 +17,7 @@ export default function parseArgs(argv) {
     Chromatic options
       --allow-console-errors  Continue running Chromatic even if there are errors logged to console in your Storybook.
       --auto-accept-changes [branch]  If there are any changes to the build, automatically accept them. Only for [branch], if specified. Globs are supported via picomatch.
-      --branch-name <branch>  Override the branch name. Only meant to be used for unsupported CI integrations and fixing cross-fork PR comparisons.
+      --branch-name <branch>  Override the branch name. Only meant to be used for unsupported CI integrations and fixing cross-fork PR comparisons. Also accepts <owner>:<branch> format.
       --exit-once-uploaded [branch]  Exit with 0 once the built version has been published to Chromatic. Only for [branch], if specified. Globs are supported via picomatch.
       --exit-zero-on-changes [branch]  If all snapshots render but there are visual changes, exit with code 0 rather than the usual exit code 1. Only for [branch], if specified. Globs are supported via picomatch.
       --ignore-last-build-on-branch <branch>  Do not use the last build on this branch as a baseline if it is no longer in history (i.e. branch was rebased). Globs are supported via picomatch.