Merge branch 'main' into support-remote-config

github · Jun 26, 2020 · ee4cc86 · ee4cc86
2 parents 0607771 + 504c8cf
commit ee4cc86
Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/lib/util.js b/lib/util.js
diff --git a/lib/util.js.map b/lib/util.js.map
diff --git a/lib/util.test.js b/lib/util.test.js
diff --git a/lib/util.test.js.map b/lib/util.test.js.map
diff --git a/src/util.test.ts b/src/util.test.ts
@@ -59,8 +59,11 @@ test('getThreadsFlag() should return the correct --threads flag', t => {
 });
 
 test('getThreadsFlag() throws if the ram input is < 0 or NaN', t => {
-  for (const input of ["hello!"]) {
-    process.env['INPUT_THREADS'] = input;
-    t.throws(util.getThreadsFlag);
-  }
+  process.env['INPUT_THREADS'] = "hello!";
+  t.throws(util.getThreadsFlag);
+});
+
+test('getRef() throws on the empty string', t => {
+  process.env["GITHUB_REF"] = "";
+  t.throws(util.getRef);
 });
diff --git a/src/util.ts b/src/util.ts
@@ -37,7 +37,7 @@ export function should_abort(actionName: string, requireInitActionHasRun: boolea
  */
 export function getRequiredEnvParam(paramName: string): string {
   const value = process.env[paramName];
-  if (value === undefined) {
+  if (value === undefined || value.length === 0) {
     throw new Error(paramName + ' environment variable must be set');
   }
   core.debug(paramName + '=' + value);