From 9a1a065c61f1d24700e208a299f787d8270c0788 Mon Sep 17 00:00:00 2001
From: Joseph Donofry <rubberduckie3554@gmail.com>
Date: Tue, 28 Feb 2023 13:39:11 -0500
Subject: [PATCH] Put releasable artifacts into artifacts dir

---
 .ci/macos/notarize.sh |  2 +-
 .gitlab-ci.yml        | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.ci/macos/notarize.sh b/.ci/macos/notarize.sh
index 2757d44c..cb3d3ef7 100755
--- a/.ci/macos/notarize.sh
+++ b/.ci/macos/notarize.sh
@@ -98,6 +98,6 @@ VERSION=${CI_COMMIT_SHORT_SHA}
 
 if [ -n "$VERSION" ]; then
     mv nheko.dmg "nheko-${VERSION}_${PLAT}.dmg"
-    mkdir artifacts
+    mkdir -p artifacts
     cp "nheko-${VERSION}_${PLAT}.dmg" artifacts/
 fi
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd62ce16..690cab7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -130,7 +130,7 @@ build-macos:
     - if : '$CI_PIPELINE_TRIGGERED == null'
   artifacts:
     paths:
-      - build/nheko.app
+      - build/nheko.app # not putting this in 'artifacts' subdir because we don't want to put it on releases
     name: nheko-${CI_COMMIT_SHORT_SHA}-macos-app
     expose_as: 'macos-app'
     public: false
@@ -186,6 +186,7 @@ build-flatpak-amd64:
   after_script:
     - bash ./.ci/upload-nightly-gitlab.sh build-flatpak/nheko-amd64.flatpak
     - (cd ./scripts && ./upload-to-flatpak-repo.sh ../build-flatpak/repo) || true
+    - (cd $CI_BUILDS_DIR && mkdir -p artifacts && cp build-flatpak/nheko-arm64.flatpak artifacts/) || true
   rules:
     - if : '$CI_PIPELINE_TRIGGERED == null'
   cache:
@@ -194,7 +195,7 @@ build-flatpak-amd64:
       - build-flatpak/.flatpak-builder/
   artifacts:
     expose_as: 'flatpak-amd64'
-    paths: ['build-flatpak/nheko-amd64.flatpak']
+    paths: ['artifacts/nheko-amd64.flatpak']
     name: flatpak-${CI_COMMIT_REF_NAME}-${VERSION}-amd64
 
 build-flatpak-arm64:
@@ -217,6 +218,7 @@ build-flatpak-arm64:
   after_script:
     - bash ./.ci/upload-nightly-gitlab.sh build-flatpak/nheko-arm64.flatpak
     - (cd ./scripts && ./upload-to-flatpak-repo.sh ../build-flatpak/repo) || true
+    - (cd $CI_BUILDS_DIR && mkdir -p artifacts && cp build-flatpak/nheko-arm64.flatpak artifacts/) || true
   rules:
     - if : '$CI_PIPELINE_TRIGGERED == "123456"'
   cache:
@@ -225,7 +227,7 @@ build-flatpak-arm64:
       - build-flatpak/.flatpak-builder/
   artifacts:
     expose_as: 'flatpak-arm64'
-    paths: ['build-flatpak/nheko-arm64.flatpak']
+    paths: ['artifacts/nheko-arm64.flatpak']
     name: flatpak-${CI_COMMIT_REF_NAME}-${VERSION}-arm64
 
 appimage-amd64:
@@ -279,12 +281,13 @@ appimage-amd64:
     - mkdir -p AppDir/usr/lib/x86_64-linux-gnu AppDir/lib/x86_64-linux-gnu
     - appimage-builder --skip-test
   after_script:
+    - mkdir -p artifacts && cp nheko-latest-x86_64.AppImage artifacts/
     - bash ./.ci/upload-nightly-gitlab.sh nheko-latest-x86_64.AppImage
   rules:
     - if : '$CI_PIPELINE_TRIGGERED == null'
   artifacts:
     paths:
-      - 'nheko-latest-x86_64.AppImage'
+      - 'artifacts/nheko-latest-x86_64.AppImage'
     expire_in: 1 week
     expose_as: 'appimage-amd64'
   cache:
@@ -314,6 +317,9 @@ github-release:
   tags: [docker]
   rules:
     - if: '$CI_COMMIT_TAG =~ /^test\d+\.\d+\.\d+$/'
+  dependencies:
+    - build
+    - sign
   before_script:
     - apk update && apk add jq curl perl
   script: