From 21afe0aaed808d95e7d62780fdce1561ef36e82b Mon Sep 17 00:00:00 2001
From: abarichello <artur@barichello.me>
Date: Mon, 18 May 2020 18:30:09 -0300
Subject: [PATCH] Update gitlab-ci template to use test-project

---
 .gitlab-ci.yml              |  24 +++++----
 test-project/.gitlab-ci.yml | 101 ------------------------------------
 2 files changed, 13 insertions(+), 112 deletions(-)
 delete mode 100755 test-project/.gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10bd8cc..17563fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,18 +11,14 @@ stages:
   - deploy
 
 variables:
-  EXPORT_NAME: game-off
-
-before_script:
-  - mkdir -v -p build/linux
-  - mkdir -v -p build/windows
-  - mkdir -v -p build/mac
-  - mkdir -v -p build/web
+  EXPORT_NAME: test-project
 
 linux:
   stage: export
   script:
-    - godot -v --export "Linux/X11" ./build/linux/$EXPORT_NAME.x86_64
+    - mkdir -v -p build/linux
+    - cd $EXPORT_NAME
+    - godot -v --export "Linux/X11" ../build/linux/$EXPORT_NAME.x86_64
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
     paths:
@@ -31,7 +27,9 @@ linux:
 windows:
   stage: export
   script:
-    - godot -v --export "Windows Desktop" ./build/windows/$EXPORT_NAME.exe
+    - mkdir -v -p build/windows
+    - cd $EXPORT_NAME
+    - godot -v --export "Windows Desktop" ../build/windows/$EXPORT_NAME.exe
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
     paths:
@@ -40,7 +38,9 @@ windows:
 mac:
   stage: export
   script:
-    - godot -v --export "Mac OSX" ./build/mac/$EXPORT_NAME.zip
+    - mkdir -v -p build/mac
+    - cd $EXPORT_NAME
+    - godot -v --export "Mac OSX" ../build/mac/$EXPORT_NAME.zip
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
     paths:
@@ -49,7 +49,9 @@ mac:
 web:
   stage: export
   script:
-    - godot -v --export "HTML5" ./build/web/index.html
+    - mkdir -v -p build/web
+    - cd $EXPORT_NAME
+    - godot -v --export "HTML5" ../build/web/index.html
   artifacts:
     name: $EXPORT_NAME-$CI_JOB_NAME
     paths:
diff --git a/test-project/.gitlab-ci.yml b/test-project/.gitlab-ci.yml
deleted file mode 100755
index 19d106f..0000000
--- a/test-project/.gitlab-ci.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-image: barichello/godot-ci:3.2
-
-stages:
-  - export
-  - deploy
-
-variables:
-  EXPORT_NAME: game-off
-
-before_script:
-  - mkdir -v -p build/linux
-  - mkdir -v -p build/windows
-  - mkdir -v -p build/mac
-  - mkdir -v -p build/web
-
-linux:
-  stage: export
-  script:
-    - godot -v --export "Linux/X11" ./build/linux/$EXPORT_NAME.x86_64
-  artifacts:
-    name: $EXPORT_NAME-$CI_JOB_NAME
-    paths:
-      - build/linux
-
-windows:
-  stage: export
-  script:
-    - godot -v --export "Windows Desktop" ./build/windows/$EXPORT_NAME.exe
-  artifacts:
-    name: $EXPORT_NAME-$CI_JOB_NAME
-    paths:
-      - build/windows
-
-mac:
-  stage: export
-  script:
-    - godot -v --export "Mac OSX" ./build/mac/$EXPORT_NAME.zip
-  artifacts:
-    name: $EXPORT_NAME-$CI_JOB_NAME
-    paths:
-      - build/mac
-
-web:
-  stage: export
-  script:
-    - godot -v --export "HTML5" ./build/web/index.html
-  artifacts:
-    name: $EXPORT_NAME-$CI_JOB_NAME
-    paths:
-      - build/web
-
-# GitHub Pages Deploy
-deploy-github-pages:
-  stage: deploy
-  dependencies:
-    - web
-  script:
-    - git checkout gh-pages
-    - rm -f *.md
-    - mv build/web/** .
-    - git config user.email $GIT_EMAIL
-    - git config user.name $GIT_USERNAME
-    - git remote add github $REMOTE_URL
-    - git add -A
-    - 'git commit -m "ci: GitHub Page $EXPORT_NAME:$CI_JOB_NAME" -m "Deploy from GitLab pipeline #$CI_PIPELINE_ID" || true'
-    - git push github gh-pages -f
-
-# GitLab Pages Deploy
-pages:
-  stage: deploy
-  dependencies:
-    - web
-  script:
-    - git checkout pages
-    - rm -f *.md
-    - mv build/web/** ./public
-  artifacts:
-    paths:
-      - public
-
-# Itch.io Deploy
-itchio:linux:
-  stage: deploy
-  script:
-    - butler push ./build/linux $ITCHIO_USERNAME/$ITCHIO_GAME:linux
-  dependencies:
-    - linux
-
-itchio:windows:
-  stage: deploy
-  script:
-    - butler push ./build/windows $ITCHIO_USERNAME/$ITCHIO_GAME:windows
-  dependencies:
-    - windows
-
-itchio:macosx:
-  stage: deploy
-  script:
-    - butler push ./build/mac $ITCHIO_USERNAME/$ITCHIO_GAME:mac
-  dependencies:
-    - mac