Merge branch 'master' into shell-allow-inc-quotes

colorer · Dec 9, 2024 · 6cedfcf · 6cedfcf
2 parents 73acfec + 04a2154
commit 6cedfcf
Show file tree

Hide file tree

Showing 3 changed files with 597 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -75,6 +75,7 @@
 - [hcl] add a new schema for HashiCorp HCL
 - [terraform] add a new schema for HashiCorp Terraform
 - [dockerfile] add a new schema for Dockerfile
+- [jenkinsfile] add a new schema for Jenkins configuration (Jenkinsfile)
 
 ## [1.2.0] - 2021-09-12
 

diff --git a/hrc/hrc/proto.hrc b/hrc/hrc/proto.hrc
@@ -223,7 +223,6 @@
         <filename>/\.groovy$/i</filename>
         <filename>/\.gdsl$/i</filename>
         <filename>/\.gradle$/i</filename>
-        <filename>/Jenkinsfile/i</filename>
         <firstline>/^import/</firstline>
         <firstline>/^#!groovy/</firstline>
         <parameters>
@@ -232,6 +231,17 @@
             <param name="spaces-as-errors" value="false" description="Shows trailing spaces as error" />
         </parameters>
     </prototype>
+    <prototype name="jenkinsfile" group="scripts" description="Jenkinsfile">
+        <location link="scripts/jenkinsfile.hrc"/>
+        <filename>/^Jenkins[Ff]ile\..+$/</filename>
+        <filename>/^.+\.Jenkins[Ff]ile/</filename>
+        <filename>/^Jenkins[Ff]ile$/</filename>
+        <filename>/\.gdsl$/i</filename>
+        <firstline weight='3'>/(^|\n)\s*pipeline\s+\{\s*$/</firstline>
+        <firstline weight='3'>/(^|\n)\s*node\s+\{\s*$/</firstline>
+        <firstline weight='3'>/(^|\n)\s*node\([^\)]\)\s+\{\s*$/</firstline>
+        <firstline weight='3'>/(^|\n)\s*import\s+org\.jenkinsci\./</firstline>
+    </prototype>
 
     <prototype name="rust" group="main" description="Rust">
         <location link="base/rust.hrc" />