From e31893fbf0cd875f1014da87e6df2913158c0be4 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Fri, 2 Oct 2020 00:10:45 +1000
Subject: [PATCH] Fix GitLab CI creating artifacts with an extra top-level dir

---
 .gitlab-ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3db043f47e..0f2e3cf778 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ package:
     expire_in: "1 month"
     name: "BizHawk_devbuild_${CI_COMMIT_REF_SLUG}_$CI_COMMIT_SHORT_SHA"
     paths:
-      - packaged_output/*
+      - ./*
   image: ubuntu:focal
   rules:
     - if: '$CI_COMMIT_REF_SLUG == "master"'
@@ -39,6 +39,11 @@ package:
   script:
     - su -c "apt-get update && apt-get -y install p7zip-full"
     - Dist/Package.sh
+      # now we replace $CI_PROJECT_DIR with $CI_PROJECT_DIR/packaged_output, so that the archival step will put everything at the top level
+    - mv packaged_output ..
+    - cd ..
+    - rm -fr $CI_PROJECT_DIR
+    - mv packaged_output $CI_PROJECT_DIR
   stage: package
 
 run_tests: