From b336519d9bfa9170598e37162aed3ccbf52b26b0 Mon Sep 17 00:00:00 2001
From: MrTeferi <freethoughtleft@gmail.com>
Date: Mon, 21 Nov 2022 20:43:00 -0600
Subject: [PATCH] Improve build pipeline

---
 .github/workflows/build.yml | 12 ++++--------
 .idea/workspace.xml         |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 31869d03..8ed9e434 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,10 +15,13 @@ jobs:
         include:
           - os: macos-latest
             TARGET: macos
+            OUTPUT_FILE: launcher
           - os: windows-latest
             TARGET: windows
+            OUTPUT_FILE: launcher.exe
           - os: ubuntu-latest
             TARGET: linux
+            OUTPUT_FILE: launcher
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python 3.10
@@ -36,14 +39,7 @@ jobs:
       run: |
         poetry run pyinstaller launcher.spec
     - name: Upload artifact Windows
-      if: matrix.os == "windows-latest"
       uses: actions/upload-artifact@v2
       with:
-        path: ./dist/launcher.exe
-        name: CC Server (${{ matrix.TARGET }})
-    - name: Upload artifact macos
-      if: matrix.os != "windows-latest"
-      uses: actions/upload-artifact@v2
-      with:
-        path: ./dist/launcher
+        path: ./dist/${{ matrix.OUTPUT_FILE }}
         name: CC Server (${{ matrix.TARGET }})
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0cc67466..2ae398fb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -38,7 +38,7 @@
       <option name="presentableId" value="Default" />
       <updated>1669081298142</updated>
       <workItem from="1669081299384" duration="1718000" />
-      <workItem from="1669083406313" duration="1037000" />
+      <workItem from="1669083406313" duration="1547000" />
     </task>
     <servers />
   </component>