From 6ad23045657a22835d470897a607ea9f032542b7 Mon Sep 17 00:00:00 2001
From: Nikita Puzankov <humb1t@yandex.ru>
Date: Fri, 3 May 2019 19:06:14 +0000
Subject: [PATCH 1/2] Reusable commit build job for linux and windows.

Former-commit-id: ee3dd9d3664fb8841fb6580db746f2160231543b
---
 .gitlab-ci.yml | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 673a624fa4..681e0de8cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -114,11 +114,19 @@ clippy:
 # Commit build
 #############
 
-commit-linux-debug:
+.commit: &commit
   stage: executable
   image: registry.gitlab.com/veloren/veloren-docker-ci
   tags:
     - veloren-docker
+  except:
+    - schedules
+  only:
+    refs:
+      - master
+
+commit:linux-debug:
+  <<: *commit
   script:
     - (cd voxygen && VELOREN_ASSETS=assets cargo build)
     - (cd server-cli && VELOREN_ASSETS=assets cargo build)
@@ -134,17 +142,9 @@ commit-linux-debug:
     paths:
       - commit-linux-debug.tar.bz2
     expire_in: 1 week
-  except:
-    - schedules
-  only:
-    refs:
-      - master
 
-commit-windows-debug:
-  stage: executable
-  image: registry.gitlab.com/veloren/veloren-docker-ci
-  tags:
-    - veloren-docker
+commit:windows-debug:
+  <<: *commit
   script:
     - (cd voxygen && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu)
     - (cd server-cli && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu)
@@ -160,11 +160,6 @@ commit-windows-debug:
     paths:
       - commit-windows-debug.zip
     expire_in: 1 week
-  except:
-    - schedules
-  only:
-    refs:
-      - master
 
 #############
 # NIGHTLY

From c1d75ddfbe5279e1f55e32cbaa186ee9f8ed98da Mon Sep 17 00:00:00 2001
From: Nikita Puzankov <humb1t@yandex.ru>
Date: Tue, 7 May 2019 05:12:46 +0000
Subject: [PATCH 2/2] Make nightly builds use reusable job.

Former-commit-id: d1606156f8766b965c6fe2265fcf430826c37254
---
 .gitlab-ci.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 681e0de8cf..dbc5fa3b7d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -165,11 +165,16 @@ commit:windows-debug:
 # NIGHTLY
 #############
 
-nightly-linux-optimized:
+.nightly: &nightly
   stage: executable
   image: registry.gitlab.com/veloren/veloren-docker-ci
   tags:
     - veloren-docker
+  only:
+    - schedules
+
+nightly:linux-optimized:
+  <<: *nightly
   script:
     - (cd voxygen && VELOREN_ASSETS=assets cargo build --release)
     - (cd server-cli && VELOREN_ASSETS=assets cargo build --release)
@@ -185,14 +190,9 @@ nightly-linux-optimized:
     paths:
       - nightly-linux-optimized.tar.bz2
     expire_in: 2 days
-  only:
-    - schedules
 
-nightly-windows-optimized:
-  stage: executable
-  image: registry.gitlab.com/veloren/veloren-docker-ci
-  tags:
-    - veloren-docker
+nightly:windows-optimized:
+  <<: *nightly
   script:
     - (cd voxygen && VELOREN_ASSETS=assets cargo build --release --target=x86_64-pc-windows-gnu)
     - (cd server-cli && VELOREN_ASSETS=assets cargo build --release --target=x86_64-pc-windows-gnu)
@@ -208,5 +208,3 @@ nightly-windows-optimized:
     paths:
       - nightly-windows-optimized.zip
     expire_in: 2 days
-  only:
-    - schedules