From 69a0fea3f5e3f446529410cf2daeb0d6ceebe28e Mon Sep 17 00:00:00 2001
From: vddcore <573729-vddcore@users.noreply.gitlab.com>
Date: Thu, 2 Jun 2022 17:16:04 +0000
Subject: [PATCH] Update .gitlab-ci.yml file. Remove commit hash and simplify
 artifact paths.

---
 .gitlab-ci.yml | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c6286a..e0218b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,10 @@
 variables:
     COMMON_FLAGS: -p:PublishTrimmed=false -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true
-    OUTPUT_DIR_WIN64: bin/Release/net6.0/win-x64/publish
-    OUTPUT_DIR_LINUX64: bin/Release/net6.0/linux-x64/publish
+    PUBLISH_DIR_WIN64: bin/Release/net6.0/win-x64/publish
+    PUBLISH_DIR_LINUX64: bin/Release/net6.0/linux-x64/publish
+    ARTIFACT_DIR: Saradomin
     GIT_SUBMODULE_STRATEGY: recursive
-    OUTPUT_FILE_PREFIX: 2009scape-launcher-$CI_COMMIT_SHORT_SHA
+    OUTPUT_FILE_PREFIX: 2009scape-launcher-
 
 stages:
     - build_all
@@ -19,21 +20,22 @@ build_all:
         - dotnet restore
         - cd Saradomin
         - dotnet publish --runtime linux-x64 --no-self-contained -c Release $COMMON_FLAGS
-        - mv $OUTPUT_DIR_LINUX64/Saradomin $OUTPUT_DIR_LINUX64/$OUTPUT_FILE_PREFIX-no_rt
+        - mv $PUBLISH_DIR_LINUX64/Saradomin ../$OUTPUT_FILE_PREFIX-no_rt
         - dotnet publish --runtime linux-x64 --self-contained -c Release $COMMON_FLAGS
-        - mv $OUTPUT_DIR_LINUX64/Saradomin $OUTPUT_DIR_LINUX64/$OUTPUT_FILE_PREFIX-sc
+        - mv $PUBLISH_DIR_LINUX64/Saradomin ../$OUTPUT_FILE_PREFIX-sc
         - dotnet publish --runtime win-x64 --no-self-contained -c Release $COMMON_FLAGS
-        - mv $OUTPUT_DIR_WIN64/Saradomin.exe $OUTPUT_DIR_WIN64/$OUTPUT_FILE_PREFIX-no_rt.exe
+        - mv $PUBLISH_DIR_WIN64/Saradomin.exe ../$OUTPUT_FILE_PREFIX-no_rt.exe
         - dotnet publish --runtime win-x64 --self-contained -c Release $COMMON_FLAGS
-        - mv $OUTPUT_DIR_WIN64/Saradomin.exe $OUTPUT_DIR_WIN64/$OUTPUT_FILE_PREFIX-sc.exe
+        - mv $PUBLISH_DIR_WIN64/Saradomin.exe ../$OUTPUT_FILE_PREFIX-sc.exe
     artifacts:
         name: "Combined artifacts"
         untracked: true
         paths:
-            - Saradomin/$OUTPUT_DIR_LINUX64/$OUTPUT_FILE_PREFIX-no_rt
-            - Saradomin/$OUTPUT_DIR_LINUX64/$OUTPUT_FILE_PREFIX-sc
-            - Saradomin/$OUTPUT_DIR_WIN64/$OUTPUT_FILE_PREFIX-no_rt.exe
-            - Saradomin/$OUTPUT_DIR_WIN64/$OUTPUT_FILE_PREFIX-sc.exe
+            - $ARTIFACT_DIR/$OUTPUT_FILE_PREFIX-no_rt
+            - $ARTIFACT_DIR/$OUTPUT_FILE_PREFIX-sc
+            - $ARTIFACT_DIR/$OUTPUT_FILE_PREFIX-no_rt.exe
+            - $ARTIFACT_DIR/$OUTPUT_FILE_PREFIX-sc.exe
+        expire_in: 1 week
 
 pack_linux_no_rt:
     stage: pack_linux_no_rt
@@ -44,7 +46,8 @@ pack_linux_no_rt:
     artifacts:
         name: "Linux x64 (no embedded runtime)"
         paths:
-            - Saradomin/$OUTPUT_DIR_LINUX64/$OUTPUT_FILE_PREFIX-no_rt
+            - $ARTIFACT_DIR/$OUTPUT_FILE_PREFIX-no_rt
+        expire_in: 1 week
 
 pack_linux_sc:
     stage: pack_linux_sc
@@ -55,7 +58,8 @@ pack_linux_sc:
     artifacts:
         name: "Linux x64 (self-contained)"
         paths:
-            - Saradomin/$OUTPUT_DIR_LINUX64/$OUTPUT_FILE_PREFIX-sc
+            - $ARTIFACT_DIR/$OUTPUT_FILE_PREFIX-sc
+        expire_in: 1 week
 
 pack_windows_no_rt:
     stage: pack_windows_no_rt
@@ -66,7 +70,8 @@ pack_windows_no_rt:
     artifacts:
         name: "Windows x64 (no embedded runtime)"
         paths:
-            - Saradomin/$OUTPUT_DIR_WIN64/$OUTPUT_FILE_PREFIX-no_rt.exe
+            - $ARTIFACT_DIR/$OUTPUT_FILE_PREFIX-no_rt.exe
+        expire_in: 1 week
 
 pack_windows_sc:
     stage: pack_windows_sc
@@ -77,4 +82,5 @@ pack_windows_sc:
     artifacts:
         name: "Windows x64 (self-contained)"
         paths:
-            - Saradomin/$OUTPUT_DIR_WIN64/$OUTPUT_FILE_PREFIX-sc.exe
+            - $ARTIFACT_DIR/$OUTPUT_FILE_PREFIX-sc.exe
+        expire_in: 1 week