[colobot] 68/100: Jenkinsfile: Update deprecated 'stage' syntax

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 4bb05b32f53c00c79ee42d28d642ecf9107e91e3
Author: krzys-h <krzys_h at interia.pl>
Date:   Sun May 21 20:19:55 2017 +0200

    Jenkinsfile: Update deprecated 'stage' syntax
---
 Jenkinsfile | 93 ++++++++++++++++++++++++++++++++-----------------------------
 data        |  2 +-
 2 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ccd147b..7b93de4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,52 +1,57 @@
+#!/usr/bin/env groovy
 properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '30', artifactNumToKeepStr: '20']]])
 
 node('master') {
-    stage 'Pull changes'
-    checkout scm
-    
-    stage 'Build Windows'
-    sh 'mkdir -p build/windows'
-    dir('build/windows') {
-        sh '''
-            cmake \
-                -DCMAKE_INSTALL_PREFIX=/install \
-                -DCMAKE_TOOLCHAIN_FILE=/opt/mxe/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake \
-                -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDEV_BUILD=1 -DPORTABLE=1 -DTOOLS=1 -DTESTS=0 ../..
-            make
-            rm -rf install
-            DESTDIR=. make install
-        '''
+    stage('Pull changes') {
+        checkout scm
     }
-    sh 'rm -f windows-debug.zip'
-    zip zipFile: 'windows-debug.zip', archive: true, dir: 'build/windows/install'
-    
-    stage 'Build Linux'
-    sh 'mkdir -p build/linux'
-    dir('build/linux') {
-        sh '''
-            cmake \
-                -DCMAKE_INSTALL_PREFIX=/install -DCOLOBOT_INSTALL_BIN_DIR=/install -DCOLOBOT_INSTALL_LIB_DIR=/install -DCOLOBOT_INSTALL_DATA_DIR=/install/data -DCOLOBOT_INSTALL_I18N_DIR=/install/lang  -DCMAKE_SKIP_INSTALL_RPATH=ON \
-                -DBOOST_STATIC=ON -DGLEW_STATIC=ON -DGLEW_LIBRARY=/usr/lib64/libGLEW.a \
-                -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDEV_BUILD=1 -DPORTABLE=1 -DTOOLS=1 -DTESTS=1 -DDESKTOP=0 ../..
-            make
-            rm -rf install
-            DESTDIR=. make install
-            patchelf --set-rpath '.' install/colobot
-        '''
+
+    stage('Build Windows') {
+        sh 'mkdir -p build/windows'
+        dir('build/windows') {
+            sh '''
+                cmake \
+                    -DCMAKE_INSTALL_PREFIX=/install \
+                    -DCMAKE_TOOLCHAIN_FILE=/opt/mxe/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake \
+                    -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDEV_BUILD=1 -DPORTABLE=1 -DTOOLS=1 -DTESTS=0 ../..
+                make
+                rm -rf install
+                DESTDIR=. make install
+            '''
+        }
+        sh 'rm -f windows-debug.zip'
+        zip zipFile: 'windows-debug.zip', archive: true, dir: 'build/windows/install'
+    }
+
+    stage('Build Linux') {
+        sh 'mkdir -p build/linux'
+        dir('build/linux') {
+            sh '''
+                cmake \
+                    -DCMAKE_INSTALL_PREFIX=/install -DCOLOBOT_INSTALL_BIN_DIR=/install -DCOLOBOT_INSTALL_LIB_DIR=/install -DCOLOBOT_INSTALL_DATA_DIR=/install/data -DCOLOBOT_INSTALL_I18N_DIR=/install/lang  -DCMAKE_SKIP_INSTALL_RPATH=ON \
+                    -DBOOST_STATIC=ON -DGLEW_STATIC=ON -DGLEW_LIBRARY=/usr/lib64/libGLEW.a \
+                    -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDEV_BUILD=1 -DPORTABLE=1 -DTOOLS=1 -DTESTS=1 -DDESKTOP=0 ../..
+                make
+                rm -rf install
+                DESTDIR=. make install
+                patchelf --set-rpath '.' install/colobot
+            '''
+        }
+        sh 'rm -f linux-debug.zip'
+        zip zipFile: 'linux-debug.zip', archive: true, dir: 'build/linux/install'
     }
-    sh 'rm -f linux-debug.zip'
-    zip zipFile: 'linux-debug.zip', archive: true, dir: 'build/linux/install'
-    
-    stage 'Doxygen'
-    dir('build/linux') {
-        sh 'make doc'
+
+    stage('Doxygen') {
+        dir('build/linux') {
+            sh 'make doc'
+        }
+        publishHTML target: [$class: 'HtmlPublisherTarget', reportName: 'Doxygen', reportDir: 'build/linux/doc/html', reportFiles: 'index.html']
     }
-    publishHTML target: [$class: 'HtmlPublisherTarget', reportName: 'Doxygen', reportDir: 'build/linux/doc/html', reportFiles: 'index.html']
-    
-    stage 'Run tests'
-    dir('build/linux') {
-        sh './colobot_ut --gtest_output=xml:gtestresults.xml || true'
+
+    stage('Run tests') {
+        dir('build/linux') {
+            sh './colobot_ut --gtest_output=xml:gtestresults.xml || true'
+        }
+        step([$class: 'XUnitBuilder', testTimeMargin: '3000', thresholdMode: 1, thresholds: [[$class: 'FailedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: '0'], [$class: 'SkippedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: '']], tools: [[$class: 'GoogleTestType', deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/linux/gtestresults.xml', skipNoTestFiles: false, s [...]
     }
-    step([$class: 'XUnitBuilder', testTimeMargin: '3000', thresholdMode: 1, thresholds: [[$class: 'FailedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: '0'], [$class: 'SkippedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: '']], tools: [[$class: 'GoogleTestType', deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/linux/gtestresults.xml', skipNoTestFiles: false, stopP [...]
 }
-
diff --git a/data b/data
index 41c03fd..b325c53 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit 41c03fda84e6eab6cd105fffd77a26cde4c1fe12
+Subproject commit b325c53316b0b4ac7fe69597bff69499bee0ef6a

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git