MORE CI fixes

Popax21 · Apr 22, 2024 · 55eb514 · 55eb514
1 parent a4de388
commit 55eb514
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/build-nuget.yml b/.github/workflows/build-nuget.yml
@@ -23,7 +23,7 @@ jobs:
         id: cache-check
         with:
           key: apphost-binaries-${{ hashFiles('apphost', '.github/workflows/build-apphost.yml') }}
-          path: apphost
+          path: apphost-bin
           lookup-only: true
 
   build-apphost:
@@ -64,11 +64,12 @@ jobs:
         uses: actions/setup-dotnet@v4
 
       - name: Download Piton apphost binaries
-        uses: actions/download-artifact@v4
+        uses: actions/cache/restore@v4
+        id: cache-check
         with:
-          pattern: apphost-*
+          key: ${{ needs.check-apphost-cache.outputs.cache-key }}
           path: apphost-bin
-          merge-multiple: true
+          fail-on-cache-miss: true
 
       - name: Pack NuGet package
         run: dotnet pack -p:TreatWarningsAsErrors=true -p:PitonAppHostBinDir=apphost-bin --output out Piton.NuGet.proj

diff --git a/Piton.NuGet.proj b/Piton.NuGet.proj
@@ -31,7 +31,7 @@
     </Target>
 
     <!-- Include apphost binaries -->
-    <Target Name="PackAppHostBinaries" BeforeTargets="Pack">
+    <Target Name="PackAppHostBinaries" BeforeTargets="Build">
         <ItemGroup>
             <PitonBaseTargets Include="win_x86" ExecSuffix=".exe" />
             <PitonBaseTargets Include="win_x64" ExecSuffix=".exe" />
@@ -56,7 +56,7 @@
             />
             <_PitonAppHostBin Include="@(_PitonAppHostBinRaw->Exists())" />
         </ItemGroup>
-        <!-- <Error Text="No apphost binaries present in PitonAppHostBinDir '$(PitonAppHostBinDir)'!" Condition="@(_PitonAppHostBin->Count()) == 0" /> -->
+        <Error Text="No apphost binaries present in PitonAppHostBinDir '$(PitonAppHostBinDir)'!" Condition="@(_PitonAppHostBin->Count()) == 0" />
 
         <!-- Include them in the packaged .nupkg -->
         <ItemGroup>