ci: parse boolean flags from string inputs

dgp1130 · alan-agius4 · commit b699a1e850ae · 2020-07-23T10:45:25.000+02:00
Flag arguments provided by minimist are always strings. Both `--branchCheck` and `--versionCheck` failed to take this into account and were incorrectly typed as a result. Now boolean flags are parsed into actual boolean types which can be used more intuitively.
diff --git a/scripts/publish.ts b/scripts/publish.ts
@@ -20,7 +20,6 @@ export interface PublishArgs {
   registry?: string;
 }
 
-
 function _exec(command: string, args: string[], opts: { cwd?: string }, logger: logging.Logger) {
   if (process.platform.startsWith('win')) {
     args.unshift('/c', command);
@@ -52,7 +51,8 @@ function _branchCheck(args: PublishArgs, logger: logging.Logger) {
     case 'master':
       if (args.tag !== 'next') {
         throw new Error(tags.oneLine`
-          Releasing from master requires a next tag. Use --branchCheck=false to skip this check.
+          Releasing from master requires a next tag. Use --no-branchCheck to
+          skip this check.
         `);
       }
   }
@@ -75,7 +75,7 @@ function _versionCheck(args: PublishArgs, logger: logging.Logger) {
   if (betaOrRc && args.tag !== 'next') {
     throw new Error(tags.oneLine`
       Releasing version ${JSON.stringify(version)} requires a next tag.
-      Use --versionCheck=false to skip this check.
+      Use --no-versionCheck to skip this check.
     `);
   }
 
@@ -90,10 +90,11 @@ function _versionCheck(args: PublishArgs, logger: logging.Logger) {
 }
 
 export default async function (args: PublishArgs, logger: logging.Logger) {
-  if (args.branchCheck === undefined || args.branchCheck === true) {
+  if (args.branchCheck ?? true) {
     _branchCheck(args, logger);
   }
-  if (args.versionCheck === undefined || args.versionCheck === true) {
+
+  if (args.versionCheck ?? true) {
     _versionCheck(args, logger);
   }
 
diff --git a/tests/legacy-cli/e2e/setup/010-local-publish.ts b/tests/legacy-cli/e2e/setup/010-local-publish.ts
@@ -8,8 +8,8 @@ export default async function() {
     'admin',
     '--',
     'publish',
-    '--versionCheck=false',
-    '--branchCheck=false',
+    '--no-versionCheck',
+    '--no-branchCheck',
     '--registry=http://localhost:4873',
   ];
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ export interface PublishArgs {`
`20`	`20`	`registry?: string;`
`21`	`21`	`}`
`22`	`22`
`23`		`-`
`24`	`23`	`function _exec(command: string, args: string[], opts: { cwd?: string }, logger: logging.Logger) {`
`25`	`24`	`if (process.platform.startsWith('win')) {`
`26`	`25`	`args.unshift('/c', command);`
`@@ -52,7 +51,8 @@ function _branchCheck(args: PublishArgs, logger: logging.Logger) {`
`52`	`51`	`case 'master':`
`53`	`52`	`if (args.tag !== 'next') {`
`54`	`53`	throw new Error(tags.oneLine`
`55`		`- Releasing from master requires a next tag. Use --branchCheck=false to skip this check.`
	`54`	`+ Releasing from master requires a next tag. Use --no-branchCheck to`
	`55`	`+ skip this check.`
`56`	`56`	`);
`57`	`57`	`}`
`58`	`58`	`}`
`@@ -75,7 +75,7 @@ function _versionCheck(args: PublishArgs, logger: logging.Logger) {`
`75`	`75`	`if (betaOrRc && args.tag !== 'next') {`
`76`	`76`	throw new Error(tags.oneLine`
`77`	`77`	`Releasing version ${JSON.stringify(version)} requires a next tag.`
`78`		`- Use --versionCheck=false to skip this check.`
	`78`	`+ Use --no-versionCheck to skip this check.`
`79`	`79`	`);
`80`	`80`	`}`
`81`	`81`
`@@ -90,10 +90,11 @@ function _versionCheck(args: PublishArgs, logger: logging.Logger) {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`export default async function (args: PublishArgs, logger: logging.Logger) {`
`93`		`- if (args.branchCheck === undefined \|\| args.branchCheck === true) {`
	`93`	`+ if (args.branchCheck ?? true) {`
`94`	`94`	`_branchCheck(args, logger);`
`95`	`95`	`}`
`96`		`- if (args.versionCheck === undefined \|\| args.versionCheck === true) {`
	`96`	`+`
	`97`	`+ if (args.versionCheck ?? true) {`
`97`	`98`	`_versionCheck(args, logger);`
`98`	`99`	`}`
`99`	`100`