From 552f147f7c4dbb88624bb7a591709c8a1268e41f Mon Sep 17 00:00:00 2001
From: yannk <yannk@khaganat.net>
Date: Sat, 2 Apr 2022 16:36:53 +0200
Subject: [PATCH] Tweaking CI presets for basic manual use

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a29f01f..0b2ced5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,40 +1,36 @@
 image: khaganat/godot-export:4
 
 stages:
-  - test
   - export
 
 variables:
-  EXPORT_NAME: khanat_client
+  EXPORT_NAME: TPbasicgame_3dclient
 
-linux64_test:
-  stage: test
+linux64:
+  stage: export
   tags:
     - Docker
   script:
-    - mkdir -v -p $EXPORT_NAME$CI_COMMIT_SHORT_SHA
-    - godot -v --export --headless "Linux/X11" $EXPORT_NAME$CI_COMMIT_SHORT_SHA/$EXPORT_NAME$CI_COMMIT_SHORT_SHA.x86_64
+    - apt-get update && apt-get install -y mesa-vulkan-drivers
+    - mkdir -v -p $EXPORT_NAME-$CI_COMMIT_SHORT_SHA
+    - godot -v --export --headless "Linux/X11" $EXPORT_NAME-$CI_COMMIT_SHORT_SHA/$EXPORT_NAME-$CI_COMMIT_SHORT_SHA.x86_64
   artifacts:
-    name: $EXPORT_NAME$CI_COMMIT_SHORT_SHA$CI_JOB_NAME
+    name: $EXPORT_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME
     paths:
-      - $EXPORT_NAME$CI_COMMIT_SHORT_SHA
+      - $EXPORT_NAME-$CI_COMMIT_SHORT_SHA
     expire_in: 1 week
-  #except:
-    #- stable
-    #- develop  
   when: manual
 
 windows:
-  stage: test
+  stage: export
   tags:
     - Docker
   script:
     - mkdir -v -p $EXPORT_NAME$CI_COMMIT_SHORT_SHA
-    - godot -v --export --headless "Windows Desktop" $EXPORT_NAME$CI_COMMIT_SHORT_SHA/$EXPORT_NAME$CI_COMMIT_SHORT_SHA.exe
+    - godot -v --export --headless "Windows Desktop" $EXPORT_NAME-$CI_COMMIT_SHORT_SHA/$EXPORT_NAME-$CI_COMMIT_SHORT_SHA.x86_64
   artifacts:
-    name: $EXPORT_NAME$CI_COMMIT_SHORT_SHA$CI_JOB_NAME
+    name: $EXPORT_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME
     paths:
-      - $EXPORT_NAME$CI_COMMIT_SHORT_SHA
-  #only:
-   # - stable
+      - $EXPORT_NAME-$CI_COMMIT_SHORT_SHA
+    expire_in: 1 week
   when: manual