From 73cceb3aa64d5d57e95a16540b7497e4bc728590 Mon Sep 17 00:00:00 2001
From: Kwoth <master.kwoth@gmail.com>
Date: Thu, 9 May 2024 11:43:38 +0000
Subject: [PATCH] ci: Fix docker and attempt to fix windows builds

---
 .dockerignore  | 14 ++------------
 .gitlab-ci.yml |  2 ++
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 983220932..c84eea1ae 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,19 +3,9 @@
 
 # Don't ignore nugetconfig
 !./NuGet.Config
+
 # Don't ignore src projects
-!src/Nadeko.Econ/**
-!src/Nadeko.Common/**
-# Use Nadeko.Medusa project
-!src/Nadeko.Medusa/**
-# Use NadekoBot project
-!src/NadekoBot/**
-# Use NadekoBot.Coordinator project
-!src/NadekoBot.Coordinator/**
-# Use Generators project
-!src/NadekoBot.Generators/**
-# Use Ayu stuff
-!src/ayu/**
+!src/**
 !docker-entrypoint.sh
 
 # ignore bin and obj folders in projects
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 949e22993..c53782784 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,7 @@ variables:
   WIN_ARM64_OUTPUT_DIR: "nadekobot-windows-arm64"
   WIN_ARM64_RELEASE: "$CI_COMMIT_TAG-windows-arm64-build.zip"
   PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/NadekoBot-build/${CI_COMMIT_TAG}"
+  INSTALLER_OUTPUT_DIR: "nadeko-installers/${CI_COMMIT_TAG}"
   INSTALLER_FILE_NAME: "nadeko-setup-${CI_COMMIT_TAG}.exe"
 
 build:
@@ -57,6 +58,7 @@ upload-builds:
    - "tar cvf $MACOS_ARM64_RELEASE $MACOS_ARM64_OUTPUT_DIR/*"
    - "zip -r $WIN_X64_RELEASE $WIN_X64_OUTPUT_DIR/*"
    - "zip -r $WIN_ARM64_RELEASE $WIN_ARM64_OUTPUT_DIR/*"
+   - "mv $INSTALLER_OUTPUT_DIR/$INSTALLER_FILE_NAME $INSTALLER_FILE_NAME"
    - |
      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $LINUX_X64_RELEASE $PACKAGE_REGISTRY_URL/$LINUX_X64_RELEASE
    - |