From ccf8a7c7238f0cf6be27dc9e273052837611326e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brandon=F0=9F=8C=A9=EF=B8=8FH?=
 <bc3tech@users.noreply.github.com>
Date: Sat, 13 Jul 2024 12:18:42 -0700
Subject: [PATCH] Packing choco separately

---
 .github/workflows/build-and-pack.yaml | 22 +++++++++++++++-------
 choco/filesorter.nuspec               |  2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-and-pack.yaml b/.github/workflows/build-and-pack.yaml
index f69d04e..61c3b9f 100644
--- a/.github/workflows/build-and-pack.yaml
+++ b/.github/workflows/build-and-pack.yaml
@@ -11,7 +11,7 @@ env:
   APP_VERSION: "0.2.${{ github.run_number }}"
 
 jobs:
-  build-and-package:
+  build:
     runs-on: windows-latest
     steps:
       - name: debug
@@ -32,6 +32,17 @@ jobs:
         with:
           name: binaries
           path: bin\Release\net8.0\win-x64\publish\**
+  choco-pack:
+    needs: build
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download a single artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: binaries
+          path: bin
 
       - name: Package
         run: cd choco && choco pack --version ${{ env.APP_VERSION }}
@@ -43,7 +54,7 @@ jobs:
           path: choco/*.nupkg
   publish-choco:
     if: github.ref == 'refs/heads/main'
-    needs: build-and-package
+    needs: choco-pack
     runs-on: windows-latest
     steps:
       - name: Download a single artifact
@@ -62,11 +73,9 @@ jobs:
             choco push "$($pkg.FullName)" -s "$env:PUSH_URL" -k "$env:API_KEY"
           }
   create-release:
-    needs:
-      - build-and-package
+    needs: build
     runs-on: ubuntu-latest
     steps:
-      # - uses: actions/checkout@v2
       - name: Download a single artifact
         uses: actions/download-artifact@v4
         with:
@@ -88,8 +97,7 @@ jobs:
           prerelease: ${{ github.ref != 'refs/heads/main'}}
           token: ${{ secrets.GITHUB_TOKEN }}
   publish-winget:
-    needs: 
-      - create-release
+    needs: create-release
     runs-on: ubuntu-latest
     steps:
     - name: Update Packages
diff --git a/choco/filesorter.nuspec b/choco/filesorter.nuspec
index 9503d36..5a82e1e 100644
--- a/choco/filesorter.nuspec
+++ b/choco/filesorter.nuspec
@@ -77,7 +77,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
     <!-- this section controls what actually gets packaged into the Chocolatey package -->
     <file src="createdump.exe.ignore" target="." />
     <file src="tools\**" target="tools" />
-    <file src="..\bin\release\net8.0\win-x64\publish\**" target="." />
+    <file src="..\bin\**" target="." />
     <!--Building from Linux? You may need this instead: <file src="tools/**" target="tools" />-->
   </files>
 </package>