Merge pull request #346 from github/simon-engledew/fix-numerical-branches

Fix for numerical branch names

lib/actions-util.js

@@ -107,6 +107,7 @@ function escapeRegExp(string) {
 }
 function patternToRegExp(value) {
     return new RegExp(`^${value
+        .toString()
         .split(GLOB_PATTERN)
         .reduce(function (arr, cur) {
         if (cur === "**") {

lib/actions-util.test.js

@@ -11,6 +11,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ava_1 = __importDefault(require("ava"));
+const yaml = __importStar(require("js-yaml"));
 const sinon_1 = __importDefault(require("sinon"));
 const actionsutil = __importStar(require("./actions-util"));
 const testing_utils_1 = require("./testing-utils");
@@ -290,4 +291,27 @@ ava_1.default("patternIsSuperset()", (t) => {
     t.true(actionsutil.patternIsSuperset("/robin/*/release/*", "/robin/moose/release/goose"));
     t.false(actionsutil.patternIsSuperset("/robin/moose/release/goose", "/robin/*/release/*"));
 });
+ava_1.default("validateWorkflow() when branches contain dots", (t) => {
+    const errors = actionsutil.validateWorkflow(yaml.safeLoad(`
+  on:
+    push:
+      branches: [4.1, master]
+    pull_request:
+      # The branches below must be a subset of the branches above
+      branches: [4.1, master]
+`));
+    t.deepEqual(errors, []);
+});
+ava_1.default("validateWorkflow() when on.push has a trailing comma", (t) => {
+    const errors = actionsutil.validateWorkflow(yaml.safeLoad(`
+name: "CodeQL"
+on:
+  push:
+    branches: [master, ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+`));
+    t.deepEqual(errors, []);
+});
 //# sourceMappingURL=actions-util.test.js.map

src/actions-util.test.ts

@@ -1,4 +1,5 @@
 import test from "ava";
+import * as yaml from "js-yaml";
 import sinon from "sinon";
 
 import * as actionsutil from "./actions-util";
@@ -400,3 +401,34 @@ test("patternIsSuperset()", (t) => {
     )
   );
 });
+
+test("validateWorkflow() when branches contain dots", (t) => {
+  const errors = actionsutil.validateWorkflow(
+    yaml.safeLoad(`
+  on:
+    push:
+      branches: [4.1, master]
+    pull_request:
+      # The branches below must be a subset of the branches above
+      branches: [4.1, master]
+`)
+  );
+
+  t.deepEqual(errors, []);
+});
+
+test("validateWorkflow() when on.push has a trailing comma", (t) => {
+  const errors = actionsutil.validateWorkflow(
+    yaml.safeLoad(`
+name: "CodeQL"
+on:
+  push:
+    branches: [master, ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+`)
+  );
+
+  t.deepEqual(errors, []);
+});

src/actions-util.ts

@@ -143,6 +143,7 @@ function escapeRegExp(string) {
 function patternToRegExp(value) {
   return new RegExp(
     `^${value
+      .toString()
       .split(GLOB_PATTERN)
       .reduce(function (arr, cur) {
         if (cur === "**") {