Apply suggestions from code review

JarLob · asgerf · web-flow · commit 891a94c16692 · 2023-05-09T16:27:32.000+02:00
Co-authored-by: Asger F &lt;asgerf@github.com&gt;
diff --git a/javascript/ql/lib/semmle/javascript/Actions.qll b/javascript/ql/lib/semmle/javascript/Actions.qll
@@ -18,7 +18,7 @@ module Actions {
         (
           f.getRelativePath().regexpMatch("(^|.*/)\\.github/workflows/.*\\.ya?ml$")
           or
-          f.getBaseName() = "action.yml"
+          f.getBaseName() = ["action.yml", "action.yaml"]
         )
       )
     }
@@ -30,7 +30,7 @@ module Actions {
    */
   class CompositeAction extends Node, YamlDocument, YamlMapping {
     CompositeAction() {
-      this.getFile().getBaseName() = "action.yml" and
+      this.getFile().getBaseName() = ["action.yml", "action.yaml"] and
       this.lookup("runs").(YamlMapping).lookup("using").(YamlScalar).getValue() = "composite"
     }
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ module Actions {`
`18`	`18`	`(`
`19`	`19`	`f.getRelativePath().regexpMatch("(^\|./)\\.github/workflows/.\\.ya?ml$")`
`20`	`20`	`or`
`21`		`- f.getBaseName() = "action.yml"`
	`21`	`+ f.getBaseName() = ["action.yml", "action.yaml"]`
`22`	`22`	`)`
`23`	`23`	`)`
`24`	`24`	`}`
`@@ -30,7 +30,7 @@ module Actions {`
`30`	`30`	`*/`
`31`	`31`	`class CompositeAction extends Node, YamlDocument, YamlMapping {`
`32`	`32`	`CompositeAction() {`
`33`		`- this.getFile().getBaseName() = "action.yml" and`
	`33`	`+ this.getFile().getBaseName() = ["action.yml", "action.yaml"] and`
`34`	`34`	`this.lookup("runs").(YamlMapping).lookup("using").(YamlScalar).getValue() = "composite"`
`35`	`35`	`}`
`36`	`36`