Merge pull request #6 from FromDoppler/DE-971-new-jenkins-compatibility

DE-971 - Compatibility with the new Jenkins

Author: andresmoschini

.dockerignore

@@ -7,6 +7,7 @@ build
 Dockerfile*
 Jenkinsfile
 .doppler-ci
+doppler-jenkins-ci.groovy
 
 # Allow copying encrypted secrets only (SOPS)
 *.[sS]ecret.*

.doppler-ci

@@ -17,7 +17,7 @@ block_comment_end = */
 max_line_length = 220
 
 # Unset for binary and generated files
-[{**.svg,**.png,**/obj/**,**/bin/**,.vscode/**,**/Properties/launchSettings.json,*.[sS]ecret.*,yarn.lock,.doppler-ci,build/**}]
+[{**.svg,**.png,**/obj/**,**/bin/**,.vscode/**,**/Properties/launchSettings.json,*.[sS]ecret.*,yarn.lock,.doppler-ci,*.groovy,build/**}]
 charset = unset
 end_of_line = unset
 insert_final_newline = unset

.editorconfig

@@ -21,7 +21,7 @@ yarn.lock
 package-lock.json
 [eE]ncrypted.[sS]ecret.*
 *.key
-.doppler-ci
+doppler-jenkins-ci.groovy
 /build
 *.env
 *.env.*

.prettierignore

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # It is only here for reference and backward compatibility, the source of truth
-# is Jenkinsfile
+# is doppler-jenkins-ci.groovy
 
 # Stop script on NZEC
 set -e
@@ -20,9 +20,13 @@ export MSYS2_ARG_CONV_EXCL="*"
 
 # See more information in https://jorisroovers.com/gitlint
 
-docker run --ulimit nofile=1024 \
-  -v "$(pwd)/.git":/repo/.git \
-  -v "$(pwd)/.gitlint":/repo/.gitlint \
-  jorisroovers/gitlint:0.18.0 \
-  --config /repo/.gitlint \
-  --commits origin/main..HEAD
+if [ -x "$(command -v gitlint)" ]; then
+  gitlint --config .gitlint --commits origin/main..HEAD
+else
+  docker run --ulimit nofile=1024 \
+    -v "$(pwd)/.git":/repo/.git \
+    -v "$(pwd)/.gitlint":/repo/.gitlint \
+    jorisroovers/gitlint:0.18.0 \
+    --config /repo/.gitlint \
+    --commits origin/main..HEAD
+fi

Jenkinsfile doppler-jenkins-ci.groovyJenkinsfile renamed to doppler-jenkins-ci.groovy

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # It is only here for reference and backward compatibility, the source of truth
-# is Jenkinsfile
+# is doppler-jenkins-ci.groovy
 
 # Stop script on NZEC
 set -e