From f4e727a9726304731fb50d2e0cc435f592b63415 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sat, 7 Apr 2018 12:17:26 -0400
Subject: [PATCH 01/20] Unzip doesn't exist, try install zip instead

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4fb1f60..c31fa3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ stages:
 job make exports:
   stage: deploy
   before_script:
-    - apt-get install unzip
+    - apt-get install zip
     - mkdir -p bin
     - wget http://downloads.tuxfamily.org/godotengine/3.0.2/Godot_v3.0.2-stable_linux_server.64.zip -O godot3-server.zip
     - unzip godot3-server.zip

From 298e2a8bfc370e1f54840a3c463488484766327d Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 10:59:45 -0400
Subject: [PATCH 02/20] Testing build again

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c31fa3e..11f34c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,8 @@ stages:
 job make exports:
   stage: deploy
   before_script:
+    - apt-get update
+    - apt-cache search zip
     - apt-get install zip
     - mkdir -p bin
     - wget http://downloads.tuxfamily.org/godotengine/3.0.2/Godot_v3.0.2-stable_linux_server.64.zip -O godot3-server.zip

From 89b0b00d79749dc6947a2a45909862435ea1f1d8 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 11:01:43 -0400
Subject: [PATCH 03/20] Install zip with -y

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11f34c3..76fdb03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,8 +9,7 @@ job make exports:
   stage: deploy
   before_script:
     - apt-get update
-    - apt-cache search zip
-    - apt-get install zip
+    - apt-get install -y zip
     - mkdir -p bin
     - wget http://downloads.tuxfamily.org/godotengine/3.0.2/Godot_v3.0.2-stable_linux_server.64.zip -O godot3-server.zip
     - unzip godot3-server.zip

From 552c6fa076a846a02d51d1c9bd514f7f993f1cfa Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 11:04:56 -0400
Subject: [PATCH 04/20] Use proper name for unzipped server binary

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76fdb03..2567101 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,8 +13,8 @@ job make exports:
     - mkdir -p bin
     - wget http://downloads.tuxfamily.org/godotengine/3.0.2/Godot_v3.0.2-stable_linux_server.64.zip -O godot3-server.zip
     - unzip godot3-server.zip
-    - chmod +x godot3-server
-    - mv godot3-server bin/
+    - mv Godot_v3.0.2-stable_linux_server.64 bin/godot3-server
+    - chmod +x bin/godot3-server
   script:
   - GODOT=./bin/godot3-server make export-all
   artifacts:

From 5889072b546d76b30683eb034c90dc45ebb51f38 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 11:07:13 -0400
Subject: [PATCH 05/20] Allow GODOT and EXPORT_TEMPLATE_SOURCE to be
 overwritten

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index d430691..746d300 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-GODOT=godot3-server
-EXPORT_TEMPLATE_SOURCE=https://downloads.tuxfamily.org/godotengine/3.0.2/Godot_v3.0.2-stable_export_templates.tpz
+GODOT?=godot3-server
+EXPORT_TEMPLATE_SOURCE?=https://downloads.tuxfamily.org/godotengine/3.0.2/Godot_v3.0.2-stable_export_templates.tpz
 BUILD_DIR?=build
 GODOT_PROJECT_PATH?=game
 PROJECT_NAME?=game

From 88ddac4ac4558536f4cf87afab907768d2a1dfb6 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 11:28:25 -0400
Subject: [PATCH 06/20] Install templates for building exports

---
 .gitlab-ci.yml |  1 +
 Makefile       | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2567101..b34fa2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,7 @@ job make exports:
     - unzip godot3-server.zip
     - mv Godot_v3.0.2-stable_linux_server.64 bin/godot3-server
     - chmod +x bin/godot3-server
+    - make install-templates
   script:
   - GODOT=./bin/godot3-server make export-all
   artifacts:
diff --git a/Makefile b/Makefile
index 746d300..f7d3dcf 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,8 @@ EXPORT_TEMPLATE_SOURCE?=https://downloads.tuxfamily.org/godotengine/3.0.2/Godot_
 BUILD_DIR?=build
 GODOT_PROJECT_PATH?=game
 PROJECT_NAME?=game
-
+GODOT_TEMPLATE_DIR?=~/.local/share/godot/templates
+GODOT_TEMPLATE_VERSION?=3.0.2.stable
 TARGET_HTML5?=HTML5
 TARGET_WINDOWS?=Windows Desktop
 TARGET_MACOSX?=Mac OSX
@@ -34,3 +35,11 @@ export-osx: build-dir
 
 export-linux: build-dir
 	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export "$(TARGET_LINUX)" "../$(BUILD_DIR)/$(PROJECT_NAME)-x11"
+
+install-templates:
+	mkdir -p "$(GODOT_TEMPLATE_DIR)"
+	wget -q $(EXPORT_TEMPLATE_SOURCE) -O templates.tpz
+	unzip templates.tpz
+	mv templates/ "$(GODOT_TEMPLATE_DIR)/$(GODOT_TEMPLATE_VERSION)"
+	rm templates.tpz
+

From d3ca58211f8c767ba3a43aa0e0bf1e1830f19a19 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 11:38:36 -0400
Subject: [PATCH 07/20] Allow wget arguments for install-templates to be
 overridden

---
 .gitlab-ci.yml | 2 +-
 Makefile       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b34fa2e..9aa5e8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ job make exports:
     - unzip godot3-server.zip
     - mv Godot_v3.0.2-stable_linux_server.64 bin/godot3-server
     - chmod +x bin/godot3-server
-    - make install-templates
+    - WGET_ARGS='' make install-templates
   script:
   - GODOT=./bin/godot3-server make export-all
   artifacts:
diff --git a/Makefile b/Makefile
index f7d3dcf..2125b47 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ TARGET_HTML5?=HTML5
 TARGET_WINDOWS?=Windows Desktop
 TARGET_MACOSX?=Mac OSX
 TARGET_LINUX?=Linux/X11
-
+WGET_ARGS?=-q
 build-dir:
 	mkdir -p "$(BUILD_DIR)"
 
@@ -38,7 +38,7 @@ export-linux: build-dir
 
 install-templates:
 	mkdir -p "$(GODOT_TEMPLATE_DIR)"
-	wget -q $(EXPORT_TEMPLATE_SOURCE) -O templates.tpz
+	wget $(WGET_ARGS) $(EXPORT_TEMPLATE_SOURCE) -O templates.tpz
 	unzip templates.tpz
 	mv templates/ "$(GODOT_TEMPLATE_DIR)/$(GODOT_TEMPLATE_VERSION)"
 	rm templates.tpz

From 5e0d592ab9fe4304723e9c7bf941550f785adc2e Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 11:39:28 -0400
Subject: [PATCH 08/20] Output free disk space before downloading templates

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9aa5e8e..0888ceb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,8 +13,10 @@ job make exports:
     - mkdir -p bin
     - wget http://downloads.tuxfamily.org/godotengine/3.0.2/Godot_v3.0.2-stable_linux_server.64.zip -O godot3-server.zip
     - unzip godot3-server.zip
+    - rm godot3-server.zip
     - mv Godot_v3.0.2-stable_linux_server.64 bin/godot3-server
     - chmod +x bin/godot3-server
+    - df -h
     - WGET_ARGS='' make install-templates
   script:
   - GODOT=./bin/godot3-server make export-all

From f129b4d852b01365e631d8883567e03cb400a4e1 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 12:03:56 -0400
Subject: [PATCH 09/20] Create cache dir before installing templates

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0888ceb..3a74ca8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ job make exports:
     - mv Godot_v3.0.2-stable_linux_server.64 bin/godot3-server
     - chmod +x bin/godot3-server
     - df -h
+    - mkdir -p ~/.cache
     - WGET_ARGS='' make install-templates
   script:
   - GODOT=./bin/godot3-server make export-all

From f9ab076b2ac475c0d7a87e0232f98ed2fc52fe89 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 12:07:48 -0400
Subject: [PATCH 10/20] Create default godot config path

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a74ca8..82d48f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,7 @@ job make exports:
     - chmod +x bin/godot3-server
     - df -h
     - mkdir -p ~/.cache
+    - mkdir -p ~/.config/godot
     - WGET_ARGS='' make install-templates
   script:
   - GODOT=./bin/godot3-server make export-all

From 0e69037e4515f744aa45d270f0e3ce31dd5bb771 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 12:14:38 -0400
Subject: [PATCH 11/20] Do not treat untracked files as artifacts

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82d48f1..6fae86e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,5 @@ job make exports:
   script:
   - GODOT=./bin/godot3-server make export-all
   artifacts:
-    untracked: true
     paths:
     - build/

From 4acb5275557b0e723c211b3e0afe6ae36f273484 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 12:15:13 -0400
Subject: [PATCH 12/20] List git status and build files after exports are
 created

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fae86e..0134276 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,9 @@ job make exports:
     - WGET_ARGS='' make install-templates
   script:
   - GODOT=./bin/godot3-server make export-all
+  after_script:
+    - find build/
+    - git status
   artifacts:
     paths:
     - build/

From 8ce207edc64333719e279a9b900442dea56ecb22 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 12:29:44 -0400
Subject: [PATCH 13/20] Output more information when setting up for export

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0134276..5f64e62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,9 +17,11 @@ job make exports:
     - mv Godot_v3.0.2-stable_linux_server.64 bin/godot3-server
     - chmod +x bin/godot3-server
     - df -h
+    - whoami
     - mkdir -p ~/.cache
     - mkdir -p ~/.config/godot
     - WGET_ARGS='' make install-templates
+    - find ~/.local/share/godot
   script:
   - GODOT=./bin/godot3-server make export-all
   after_script:

From 7efce3aee6d5e269d5c3f384676bf1beece4ecd7 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 12:30:27 -0400
Subject: [PATCH 14/20] Unquote GODOT_TEMPLATE_DIR in Makefile

Using the quoted string created the directory '~' in the current working
directory instead of expanding the '~' into the home directory of the
current user.
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2125b47..9d130cb 100644
--- a/Makefile
+++ b/Makefile
@@ -37,9 +37,9 @@ export-linux: build-dir
 	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export "$(TARGET_LINUX)" "../$(BUILD_DIR)/$(PROJECT_NAME)-x11"
 
 install-templates:
-	mkdir -p "$(GODOT_TEMPLATE_DIR)"
+	mkdir -p $(GODOT_TEMPLATE_DIR)
 	wget $(WGET_ARGS) $(EXPORT_TEMPLATE_SOURCE) -O templates.tpz
 	unzip templates.tpz
-	mv templates/ "$(GODOT_TEMPLATE_DIR)/$(GODOT_TEMPLATE_VERSION)"
+	mv templates/ $(GODOT_TEMPLATE_DIR)/$(GODOT_TEMPLATE_VERSION)
 	rm templates.tpz
 

From 84756bd5c06580587b1317953ad3ca1b74e2f1ae Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 13:06:00 -0400
Subject: [PATCH 15/20] Separate export targets within the build directory

---
 Makefile | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 9d130cb..06e7728 100644
--- a/Makefile
+++ b/Makefile
@@ -19,22 +19,29 @@ clean:
 export-all: export-html5 export-windows export-osx export-linux
 
 export-pack: build-dir
-	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export "pack" "../$(BUILD_DIR)/$(PROJECT_NAME).pck"
+	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export_debug --export "pack" "../$(BUILD_DIR)/$(PROJECT_NAME).pck"
 
 export-html5: build-dir
 	mkdir -p "$(BUILD_DIR)/html"
-	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export "$(TARGET_HTML5)" "../$(BUILD_DIR)/html/$(PROJECT_NAME).html"
+	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export_debug --export "$(TARGET_HTML5)" "../$(BUILD_DIR)/html/$(PROJECT_NAME).html"
 	zip -j -r "$(BUILD_DIR)/$(PROJECT_NAME)-html5.zip" "$(BUILD_DIR)/html"
 	rm -rf "$(BUILD_DIR)/html"
 
 export-windows: build-dir
-	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export "$(TARGET_WINDOWS)" "../$(BUILD_DIR)/$(PROJECT_NAME).exe"
+	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export_debug --export "$(TARGET_WINDOWS)" $(PROJECT_NAME).exe
+	mkdir -p "$(BUILD_DIR)/win/"
+	mv -t "$(BUILD_DIR)/win/" $(GODOT_PROJECT_PATH)/$(PROJECT_NAME).exe* $(GODOT_PROJECT_PATH)/$(PROJECT_NAME).pck
 
 export-osx: build-dir
-	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export "$(TARGET_MACOSX)" "../$(BUILD_DIR)/$(PROJECT_NAME)-osx"
+	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export_debug --export "$(TARGET_MACOSX)" $(PROJECT_NAME).osx
+	mkdir -p "$(BUILD_DIR)/osx/"
+	# Data is bundled into $(PROJECT_NAME).osx
+	mv -t "$(BUILD_DIR)/osx/" $(GODOT_PROJECT_PATH)/$(PROJECT_NAME).osx*
 
 export-linux: build-dir
-	$(GODOT) --path "$(GODOT_PROJECT_PATH)" --export "$(TARGET_LINUX)" "../$(BUILD_DIR)/$(PROJECT_NAME)-x11"
+	$(GODOT) --path $(GODOT_PROJECT_PATH) --export_debug --export "$(TARGET_LINUX)" $(PROJECT_NAME)-x11
+	mkdir -p "$(BUILD_DIR)/x11/"
+	mv -t "$(BUILD_DIR)/x11/" $(GODOT_PROJECT_PATH)/$(PROJECT_NAME)-x11*
 
 install-templates:
 	mkdir -p $(GODOT_TEMPLATE_DIR)

From 4d1fad5cf1fe8ceb49870b3e3174e63957fc9a09 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 13:21:08 -0400
Subject: [PATCH 16/20] Split export into multiple jobs

---
 .gitlab-ci.yml | 77 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 54 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f64e62..2c4f20b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,30 +3,61 @@ stages:
   - test
   - deploy
 
+before_script:
+  - apt-get update
+  - apt-get install -y zip
+  - mkdir -p bin
+  - mkdir -p ~/.cache
+  - mkdir -p ~/.config/godot
+  - wget http://downloads.tuxfamily.org/godotengine/3.0.2/Godot_v3.0.2-stable_linux_server.64.zip -O godot3-server.zip
+  - unzip godot3-server.zip
+  - rm godot3-server.zip
+  - mv Godot_v3.0.2-stable_linux_server.64 bin/godot3-server
+  - chmod +x bin/godot3-server
+  - df -h
+  - WGET_ARGS='' make install-templates
 
-
-job make exports:
-  stage: deploy
-  before_script:
-    - apt-get update
-    - apt-get install -y zip
-    - mkdir -p bin
-    - wget http://downloads.tuxfamily.org/godotengine/3.0.2/Godot_v3.0.2-stable_linux_server.64.zip -O godot3-server.zip
-    - unzip godot3-server.zip
-    - rm godot3-server.zip
-    - mv Godot_v3.0.2-stable_linux_server.64 bin/godot3-server
-    - chmod +x bin/godot3-server
-    - df -h
-    - whoami
-    - mkdir -p ~/.cache
-    - mkdir -p ~/.config/godot
-    - WGET_ARGS='' make install-templates
-    - find ~/.local/share/godot
+export:html5:
+  - stage: deploy
   script:
-  - GODOT=./bin/godot3-server make export-all
-  after_script:
-    - find build/
-    - git status
+    - GODOT=./bin/godot3-server make export-html5
   artifacts:
     paths:
-    - build/
+      - build/
+    only:
+      - tags
+    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-html5
+
+export:windows:
+  - stage: deploy
+  script:
+    - GODOT=./bin/godot3-server make export-windows
+  artifacts:
+    paths:
+      - build/
+    only:
+      - tags
+    name: "$CI_PROJECT_NAME"-windows
+    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-windows
+
+export:osx:
+  - stage: deploy
+  script:
+    - GODOT=./bin/godot3-server make export-osx
+  artifacts:
+    paths:
+      - build/
+    only:
+      - tags
+    name: "$CI_PROJECT_NAME"-osx
+    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-osx
+
+export:linux:
+  - stage: deploy
+  script:
+    - GODOT=./bin/godot3-server make export-linux
+  artifacts:
+    paths:
+      - build/
+    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-linux
+

From 280806ae2d7bac6f43c72ae1a2579b62b5f408c0 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 13:23:14 -0400
Subject: [PATCH 17/20] Fix gitlab-ci yaml syntax

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c4f20b..dab9d77 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ before_script:
   - WGET_ARGS='' make install-templates
 
 export:html5:
-  - stage: deploy
+  stage: deploy
   script:
     - GODOT=./bin/godot3-server make export-html5
   artifacts:
@@ -29,7 +29,7 @@ export:html5:
     name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-html5
 
 export:windows:
-  - stage: deploy
+  stage: deploy
   script:
     - GODOT=./bin/godot3-server make export-windows
   artifacts:
@@ -41,7 +41,7 @@ export:windows:
     name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-windows
 
 export:osx:
-  - stage: deploy
+  stage: deploy
   script:
     - GODOT=./bin/godot3-server make export-osx
   artifacts:
@@ -53,7 +53,7 @@ export:osx:
     name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-osx
 
 export:linux:
-  - stage: deploy
+  stage: deploy
   script:
     - GODOT=./bin/godot3-server make export-linux
   artifacts:

From 22139ca0e29b7e43931e06959c8fd7324462959e Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 13:25:24 -0400
Subject: [PATCH 18/20] Fix only syntax in export jobs

---
 .gitlab-ci.yml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dab9d77..7e51a1f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,42 +22,40 @@ export:html5:
   script:
     - GODOT=./bin/godot3-server make export-html5
   artifacts:
-    paths:
-      - build/
-    only:
-      - tags
     name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-html5
+    paths:
+    - build/
+  only:
+    - tags
 
 export:windows:
   stage: deploy
   script:
     - GODOT=./bin/godot3-server make export-windows
   artifacts:
+    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-windows
     paths:
       - build/
-    only:
-      - tags
-    name: "$CI_PROJECT_NAME"-windows
-    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-windows
+  only:
+    - tags
 
 export:osx:
   stage: deploy
   script:
     - GODOT=./bin/godot3-server make export-osx
   artifacts:
+    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-osx
     paths:
       - build/
-    only:
-      - tags
-    name: "$CI_PROJECT_NAME"-osx
-    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-osx
+  only:
+    - tags
 
 export:linux:
   stage: deploy
   script:
     - GODOT=./bin/godot3-server make export-linux
   artifacts:
+    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-linux
     paths:
       - build/
-    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-linux
 

From a6b18579ca4ff53e7c70ba2710caa06288e53729 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 13:27:04 -0400
Subject: [PATCH 19/20] Fix quote syntax for export artifact names

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e51a1f..c5f2182 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ export:html5:
   script:
     - GODOT=./bin/godot3-server make export-html5
   artifacts:
-    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-html5
+    name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-html5"
     paths:
     - build/
   only:
@@ -33,7 +33,7 @@ export:windows:
   script:
     - GODOT=./bin/godot3-server make export-windows
   artifacts:
-    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-windows
+    name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-windows"
     paths:
       - build/
   only:
@@ -44,7 +44,7 @@ export:osx:
   script:
     - GODOT=./bin/godot3-server make export-osx
   artifacts:
-    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-osx
+    name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-osx"
     paths:
       - build/
   only:
@@ -55,7 +55,7 @@ export:linux:
   script:
     - GODOT=./bin/godot3-server make export-linux
   artifacts:
-    name: "$CI_PROJECT_NAME"-"$CI_COMMIT_REF_NAME"-linux
+    name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-linux"
     paths:
       - build/
 

From 24f62b0ef218b30926568c049bb9242ea148903f Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 8 Apr 2018 13:35:46 -0400
Subject: [PATCH 20/20] Change export naming, add tag only linux version

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c5f2182..9103751 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ export:html5:
   script:
     - GODOT=./bin/godot3-server make export-html5
   artifacts:
-    name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-html5"
+    name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_TAG-html5"
     paths:
     - build/
   only:
@@ -33,7 +33,7 @@ export:windows:
   script:
     - GODOT=./bin/godot3-server make export-windows
   artifacts:
-    name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-windows"
+    name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_TAG-windows"
     paths:
       - build/
   only:
@@ -44,7 +44,7 @@ export:osx:
   script:
     - GODOT=./bin/godot3-server make export-osx
   artifacts:
-    name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-osx"
+    name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_TAG-osx"
     paths:
       - build/
   only:
@@ -55,7 +55,19 @@ export:linux:
   script:
     - GODOT=./bin/godot3-server make export-linux
   artifacts:
-    name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-linux"
+    name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_TAG-linux"
     paths:
       - build/
+  only:
+    - tags
 
+export:linux_commit:
+  stage: deploy
+  script:
+    - GODOT=./bin/godot3-server make export-linux
+  artifacts:
+    name: "$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA-linux"
+    paths:
+      - build/
+  except:
+    - tags