From b2d3bdb43c17bd3141010a0122cb2df7bf49b8c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Tue, 29 May 2018 10:21:42 +0200
Subject: [PATCH 1/8] Added script to pack sources

---
 CI/ci-source.sh | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100755 CI/ci-source.sh

diff --git a/CI/ci-source.sh b/CI/ci-source.sh
new file mode 100755
index 00000000..da0956fa
--- /dev/null
+++ b/CI/ci-source.sh
@@ -0,0 +1,36 @@
+
+# This script just creates compressed files of OpenMesh sources
+
+# Create Build directory and Build documentation
+mkdir build
+
+cd build
+cmake ..
+make doc
+cd ..
+
+# Extract Version Information
+VERSION=OpenMesh-$(cat ../VERSION | grep VERSION | tr -d "VERSION=")
+
+# Create Publishing directory
+mkdir OpenMesh-$VERSION
+
+# Move all files into Publishing directory
+mv CHANGELOG.md   $VERSION/
+mv cmake          $VERSION/
+mv CMakeLists.txt $VERSION/
+mv debian         $VERSION/
+mv Doc            $VERSION/
+mv LICENSE        $VERSION/
+mv README.md      $VERSION/
+mv src            $VERSION/
+mv VERSION        $VERSION/ 
+
+mv build/Build/share/OpenMesh/Doc/html/  OpenMesh-$VERSION/Documentation
+
+tar 
+
+tar cjf $VERSION.tar.bz2 $VERSION &
+tar czf $VERSION.tar.gz $VERSION &
+zip -9 -q -r $VERSION.zip $VERSION &
+

From ee2976b58e7d79cb27a74763566b2f79f091e75f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Tue, 29 May 2018 10:23:36 +0200
Subject: [PATCH 2/8] Runs sources step

---
 .gitlab-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95d8d1d6..0d002149 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -345,3 +345,7 @@ Doc-publish:
   script: "CI/ci-doc.sh"
   tags:
      - Linux
+
+Sources:
+  script: "CI/ci-source.sh"
+

From 50914787ea67d9fd849d82e7fc630e72522afa67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Tue, 29 May 2018 10:24:35 +0200
Subject: [PATCH 3/8] Fixed typo

---
 CI/ci-source.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CI/ci-source.sh b/CI/ci-source.sh
index da0956fa..398eb6cd 100755
--- a/CI/ci-source.sh
+++ b/CI/ci-source.sh
@@ -10,7 +10,7 @@ make doc
 cd ..
 
 # Extract Version Information
-VERSION=OpenMesh-$(cat ../VERSION | grep VERSION | tr -d "VERSION=")
+VERSION=OpenMesh-$(cat VERSION | grep VERSION | tr -d "VERSION=")
 
 # Create Publishing directory
 mkdir OpenMesh-$VERSION

From 06a5e4e1d2574d53ccbb079a4b06e9070eb49f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Tue, 29 May 2018 10:26:09 +0200
Subject: [PATCH 4/8] Fixed another typo

---
 CI/ci-source.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CI/ci-source.sh b/CI/ci-source.sh
index 398eb6cd..80bf8f21 100755
--- a/CI/ci-source.sh
+++ b/CI/ci-source.sh
@@ -2,9 +2,9 @@
 # This script just creates compressed files of OpenMesh sources
 
 # Create Build directory and Build documentation
-mkdir build
+mkdir build-doc
 
-cd build
+cd build-doc
 cmake ..
 make doc
 cd ..
@@ -13,7 +13,7 @@ cd ..
 VERSION=OpenMesh-$(cat VERSION | grep VERSION | tr -d "VERSION=")
 
 # Create Publishing directory
-mkdir OpenMesh-$VERSION
+mkdir $VERSION
 
 # Move all files into Publishing directory
 mv CHANGELOG.md   $VERSION/
@@ -26,7 +26,7 @@ mv README.md      $VERSION/
 mv src            $VERSION/
 mv VERSION        $VERSION/ 
 
-mv build/Build/share/OpenMesh/Doc/html/  OpenMesh-$VERSION/Documentation
+mv build-doc/Build/share/OpenMesh/Doc/html/  $VERSION/Documentation
 
 tar 
 

From 58b2afb498f10b1ec3ff40febf3869a005674b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Tue, 29 May 2018 10:27:48 +0200
Subject: [PATCH 5/8] Fixed another typo

---
 CI/ci-source.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/CI/ci-source.sh b/CI/ci-source.sh
index 80bf8f21..5fa53811 100755
--- a/CI/ci-source.sh
+++ b/CI/ci-source.sh
@@ -28,9 +28,7 @@ mv VERSION        $VERSION/
 
 mv build-doc/Build/share/OpenMesh/Doc/html/  $VERSION/Documentation
 
-tar 
-
-tar cjf $VERSION.tar.bz2 $VERSION &
-tar czf $VERSION.tar.gz $VERSION &
-zip -9 -q -r $VERSION.zip $VERSION &
+tar cjf $VERSION.tar.bz2 $VERSION 
+tar czf $VERSION.tar.gz $VERSION 
+zip -9 -q -r $VERSION.zip $VERSION 
 

From 8934a5a9052dbf40a7d0e7c9f15174c187b09592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Tue, 29 May 2018 10:31:31 +0200
Subject: [PATCH 6/8] Added a source stage

---
 .gitlab-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d002149..57bda5f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -347,5 +347,12 @@ Doc-publish:
      - Linux
 
 Sources:
+  only:
+     - master
   script: "CI/ci-source.sh"
+  artifacts:
+    paths:
+      - *.zip
+      - *.tar.bz2
+      - *.tar.gz
 

From 15a6bbcea312903f73e56248bec7ac70c6b514b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Tue, 29 May 2018 10:35:12 +0200
Subject: [PATCH 7/8] Added stages

---
 .gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57bda5f5..90c82d8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,33 @@
+stages:
+  - build
+  - deploy
+
 gcc-c++11:
+  stage: build
   script: "CI/ci-linux.sh gcc C++11"
   tags:
     - Linux
 
 clang-c++11:
+  stage: build
   script: "CI/ci-linux.sh clang C++11"
   tags:
     - Linux
 
 gcc-c++14:
+  stage: build
   script: "CI/ci-linux.sh gcc C++14"
   tags:
     - Linux
 
 clang-c++14:
+  stage: build
   script: "CI/ci-linux.sh clang C++14"
   tags: 
     - Linux
 
 macos-c++11:
+  stage: build
   script: "CI/ci-mac.sh C++11"
   tags:
     - Apple
@@ -28,6 +37,7 @@ macos-c++11:
       - build-release-cpp11/*.tar.gz
 
 macos-c++98:
+  stage: build
   script: "CI/ci-mac.sh C++14"
   tags:
     - Apple
@@ -37,6 +47,7 @@ macos-c++98:
       - build-release-cpp14/*.tar.gz
 
 cppcheck:
+  stage: build
   script: "CI/ci-cppcheck.sh"
   tags:
     - Linux
@@ -45,6 +56,7 @@ cppcheck:
       - cppcheck.log
       
 VS2017-64-bit-shared-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2017"
     ARCHITECTURE:   "x64"
@@ -59,6 +71,7 @@ VS2017-64-bit-shared-apps:
       - build-release/*.exe      
       
 VS2017-64-bit-static-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2017"
     ARCHITECTURE:   "x64"
@@ -74,6 +87,7 @@ VS2017-64-bit-static-apps:
 
       
 VS2017-64-bit-shared-no-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2017"
     ARCHITECTURE:   "x64"
@@ -88,6 +102,7 @@ VS2017-64-bit-shared-no-apps:
 
 
 VS2017-32-bit-shared-no-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2017"
     ARCHITECTURE:   "x32"
@@ -102,6 +117,7 @@ VS2017-32-bit-shared-no-apps:
       
 
 VS2017-64-bit-static-no-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2017"
     ARCHITECTURE:   "x64"
@@ -116,6 +132,7 @@ VS2017-64-bit-static-no-apps:
 
 
 VS2017-32-bit-static-no-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2017"
     ARCHITECTURE:   "x32"
@@ -129,6 +146,7 @@ VS2017-32-bit-static-no-apps:
       - build-release/*.exe
 
 VS2015-64-bit-shared-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2015"
     ARCHITECTURE:   "x64"
@@ -143,6 +161,7 @@ VS2015-64-bit-shared-apps:
       
       
 VS2015-64-bit-shared-no-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2015"
     ARCHITECTURE:   "x64"
@@ -156,6 +175,7 @@ VS2015-64-bit-shared-no-apps:
       - build-release/*.exe
 
 VS2015-32-bit-shared-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2015"
     ARCHITECTURE:   "x32"
@@ -169,6 +189,7 @@ VS2015-32-bit-shared-apps:
       - build-release/*.exe
 
 VS2015-32-bit-shared-no-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2015"
     ARCHITECTURE:   "x32"
@@ -182,6 +203,7 @@ VS2015-32-bit-shared-no-apps:
       - build-release/*.exe
       
 VS2015-64-bit-static-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2015"
     ARCHITECTURE:   "x64"
@@ -195,6 +217,7 @@ VS2015-64-bit-static-apps:
       - build-release/*.exe
 
 VS2015-64-bit-static-no-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2015"
     ARCHITECTURE:   "x64"
@@ -208,6 +231,7 @@ VS2015-64-bit-static-no-apps:
       - build-release/*.exe
 
 VS2015-32-bit-static-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2015"
     ARCHITECTURE:   "x32"
@@ -221,6 +245,7 @@ VS2015-32-bit-static-apps:
       - build-release/*.exe
 
 VS2015-32-bit-static-no-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2015"
     ARCHITECTURE:   "x32"
@@ -236,6 +261,7 @@ VS2015-32-bit-static-no-apps:
       
       
 VS2013-64-bit-shared-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2013"
     ARCHITECTURE:   "x64"
@@ -249,6 +275,7 @@ VS2013-64-bit-shared-apps:
       - build-release/*.exe
 
 VS2013-64-bit-shared-no-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2013"
     ARCHITECTURE:   "x64"
@@ -262,6 +289,7 @@ VS2013-64-bit-shared-no-apps:
       - build-release/*.exe
 
 VS2013-32-bit-shared-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2013"
     ARCHITECTURE:   "x32"
@@ -275,6 +303,7 @@ VS2013-32-bit-shared-apps:
       - build-release/*.exe
 
 VS2013-32-bit-shared-no-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2013"
     ARCHITECTURE:   "x32"
@@ -288,6 +317,7 @@ VS2013-32-bit-shared-no-apps:
       - build-release/*.exe
       
 VS2013-64-bit-static-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2013"
     ARCHITECTURE:   "x64"
@@ -301,6 +331,7 @@ VS2013-64-bit-static-apps:
       - build-release/*.exe
 
 VS2013-64-bit-static-no-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2013"
     ARCHITECTURE:   "x64"
@@ -314,6 +345,7 @@ VS2013-64-bit-static-no-apps:
       - build-release/*.exe
 
 VS2013-32-bit-static-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2013"
     ARCHITECTURE:   "x32"
@@ -327,6 +359,7 @@ VS2013-32-bit-static-apps:
       - build-release/*.exe
 
 VS2013-32-bit-static-no-apps:
+  stage: build
   variables:
     BUILD_PLATFORM: "VS2013"
     ARCHITECTURE:   "x32"
@@ -340,6 +373,7 @@ VS2013-32-bit-static-no-apps:
       - build-release/*.exe      
       
 Doc-publish:
+  stage: deploy
   only:
      - master
   script: "CI/ci-doc.sh"
@@ -347,6 +381,7 @@ Doc-publish:
      - Linux
 
 Sources:
+  stage: deploy
   only:
      - master
   script: "CI/ci-source.sh"

From 0f286ba49c45b83cb3c52d0e65499f75537acc37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Tue, 29 May 2018 10:37:14 +0200
Subject: [PATCH 8/8] Changed artifact paths

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90c82d8f..84aa9dd8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -387,7 +387,7 @@ Sources:
   script: "CI/ci-source.sh"
   artifacts:
     paths:
-      - *.zip
-      - *.tar.bz2
-      - *.tar.gz
+      - OpenMesh*.zip
+      - OpenMesh*.tar.bz2
+      - OpenMesh*.tar.gz