From fa1e3ea3e1029918e08fdb2bd8c1ce4f2c8c7765 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Sat, 2 Apr 2022 18:29:37 +0200
Subject: [PATCH] Fix zip-in-zip artifact upload for Windows

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3fd8509f..bbf80788 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -230,7 +230,7 @@ jobs:
           else
             package_name="${package_name}-MSVC"
           fi
-          package_ext=".zip"
+          package_ext="" # Directory, uploading will automatically zip it
         elif [ '${{ runner.os }}' == 'macOS' ]; then
           package_name="${package_name}-macOS"
           package_ext=".dmg"
@@ -293,17 +293,17 @@ jobs:
           binPath="${binPath}/${{ env.BUILD_TYPE }}"
         fi
         if [ '${{ matrix.config.compiler }}' == 'mingw' ] && [ '${{ env.BUILD_TYPE }}' == 'Release' ]; then
+          # FIXME arch-specific strip prefix
           i686-w64-mingw32-strip -s "${binPath}/furnace.exe"
         fi
 
-        mkdir target
-        pushd target
+        mkdir ${{ steps.package-identify.outputs.filename }}
+        pushd ${{ steps.package-identify.outputs.filename }}
 
         cp -v ../LICENSE LICENSE.txt
         cp -v ../README.md README.txt
         cp -vr ../{papers,demos} ../${binPath}/furnace.exe ./
 
-        7z a -tzip ../${{ steps.package-identify.outputs.filename }} *
         popd
 
     - name: Package [macOS]