Fixed Jenkinsfile conflict from Jenkinsfile rebase

2025-11-10 15:43:28 +00:00 · 2018-12-26 01:42:34 -06:00 · 2018-12-26 01:42:34 -06:00 · 7f60933f3b
commit 7f60933f3b
parent e336cffcb9 e6b83f216c
1 changed files with 15 additions and 0 deletions
--- a/15
+++ b/15
@ -5,6 +5,7 @@ pipeline {
        stage('Build') {
            steps {
                sh '/opt/squish/bin/squish --no-minify'
+<<<<<<< HEAD
                sh 'ldoc {env.WORKSPACE}'
            }
        }
@ -17,5 +18,19 @@ pipeline {

            }
        }*/
+=======
+                sh "ldoc ${env.WORKSPACE}"
+            }
+        }
+       stage('Deploy') {
+            when {
+                tag 'release-*'
+            }
+
+            steps {
+                sh "python3 /opt/hoggit_releaser/releaser.py ${env.WORKSPACE} ${env.TAG_NAME}"
+            }
+        }
+>>>>>>> feature/Jenkinsfile
    }
 }