From 56e0a17418c2bc695e702f5c9691e32f761a4173 Mon Sep 17 00:00:00 2001
From: Ulrich Huber <ulrich@huberulrich.de>
Date: Wed, 12 Jun 2019 21:50:04 -0400
Subject: [PATCH] Reenable full pipeline

---
 azure-pipelines.yml | 97 +++++++++++++++++++++------------------------
 1 file changed, 46 insertions(+), 51 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d4a02737..dce8a483 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,64 +7,61 @@ trigger:
 - master
 
 stages:
-#- stage: 'Build_Test_Stage'
-#  jobs:
-#  - job: 'Build_Test'
-#    pool:
-#      vmImage: 'ubuntu-16.04'
-#    displayName: 'Test Xournal++ on Linux'
-#    steps:
-#    - bash: |
-#        sudo apt-get update
-#        sudo apt-get install -y cmake libcppunit-dev libgtk-3-dev libpoppler-glib-dev portaudio19-dev libsndfile-dev liblua5.3-dev libzip-dev
-#      displayName: 'Install dependencies'
-#    - bash: |
-#        mkdir build
-#      displayName: 'Create build directory'
-#    - bash: |
-#        cmake .. -DCMAKE_DEBUG_INCLUDES_LDFLAGS=ON -DENABLE_CPPUNIT=ON -DDEBUG_COMPILE=ON
-#        make -j `grep processor /proc/cpuinfo | tail -c 2`
-#      workingDirectory: ./build
-#      displayName: 'Build Xournal++'
-#    - bash: |
-#        ctest
-#      workingDirectory: ./build
-#      displayName: 'Run tests'
+- stage: 'Build_Test_Stage'
+  jobs:
+  - job: 'Build_Test'
+    pool:
+      vmImage: 'ubuntu-16.04'
+    displayName: 'Test Xournal++ on Linux'
+    steps:
+    - bash: |
+        sudo apt-get update
+        sudo apt-get install -y cmake libcppunit-dev libgtk-3-dev libpoppler-glib-dev portaudio19-dev libsndfile-dev liblua5.3-dev libzip-dev
+      displayName: 'Install dependencies'
+    - bash: |
+        mkdir build
+      displayName: 'Create build directory'
+    - bash: |
+        cmake .. -DCMAKE_DEBUG_INCLUDES_LDFLAGS=ON -DENABLE_CPPUNIT=ON -DDEBUG_COMPILE=ON
+        make -j `grep processor /proc/cpuinfo | tail -c 2`
+      workingDirectory: ./build
+      displayName: 'Build Xournal++'
+    - bash: |
+        ctest
+      workingDirectory: ./build
+      displayName: 'Run tests'
 
 - stage: Release
   jobs:
-#  - job: Linux
-#    pool:
-#      vmImage: 'ubuntu-16.04'
-#    displayName: 'Build for Linux'
-#    steps:
-#    - bash: |
-#        sudo apt-get update
-#        sudo apt-get install -y cmake libcppunit-dev libgtk-3-dev libpoppler-glib-dev portaudio19-dev libsndfile-dev liblua5.3-dev libzip-dev
-#      displayName: 'Install dependencies'
-#    - bash: |
-#        mkdir build
-#      displayName: 'Create build directory'
-#    - bash: |
-#        cmake ..
-#        make
-#      workingDirectory: ./build
-#      displayName: 'Build Xournal++'
-#    - task: PublishBuildArtifacts@1
-#      inputs:
-#        PathtoPublish: './build'
-#        ArtifactName: 'release_linux'
-#        publishLocation: 'Container'
-#      displayName: 'Publish Linux Build'
+  - job: Linux
+    pool:
+      vmImage: 'ubuntu-16.04'
+    displayName: 'Build for Linux'
+    steps:
+    - bash: |
+        sudo apt-get update
+        sudo apt-get install -y cmake libcppunit-dev libgtk-3-dev libpoppler-glib-dev portaudio19-dev libsndfile-dev liblua5.3-dev libzip-dev
+      displayName: 'Install dependencies'
+    - bash: |
+        mkdir build
+      displayName: 'Create build directory'
+    - bash: |
+        cmake ..
+        make
+      workingDirectory: ./build
+      displayName: 'Build Xournal++'
+    - task: PublishBuildArtifacts@1
+      inputs:
+        PathtoPublish: './build'
+        ArtifactName: 'release_linux'
+        publishLocation: 'Container'
+      displayName: 'Publish Linux Build'
 
   - job: Windows
     pool:
       vmImage: 'vs2017-win2016'
     displayName: 'Build for Windows'
     steps:
-#    - script: |
-#        choco install msys2 --params="/InstallDir:%CD:~0,2%\msys64 /NoUpdate /NoPath"
-#      displayName: 'Install MSYS2'
     - script: |
         git clone https://github.com/msys2/msys2-ci-base.git %CD:~0,2%\msys64
         %CD:~0,2%\msys64\usr\bin\rm -rf %CD:~0,2%\msys64\.git
@@ -93,7 +90,6 @@ stages:
       displayName: 'Build Portaudio'
     - script: |
         set PATH=%PATH%;%CD:~0,2%\msys64\usr\bin;%CD:~0,2%\msys64\mingw64\bin"
-        %CD:~0,2%\msys64\usr\bin\bash -lc "echo $PWD"
         %CD:~0,2%\msys64\usr\bin\bash -lc "mkdir build"
       env:
         MSYS2_ARCH: x86_64
@@ -102,7 +98,6 @@ stages:
       displayName: 'Create build directory'
     - script: |
         set PATH=%PATH%;%CD:~0,2%\msys64\usr\bin;%CD:~0,2%\msys64\mingw64\bin"
-        %CD:~0,2%\msys64\usr\bin\bash -lc "echo $PWD"
         %CD:~0,2%\msys64\usr\bin\bash -lc "cmake .."
         %CD:~0,2%\msys64\usr\bin\bash -lc "make"
       workingDirectory: ./build