From 0364557533c984b7c85785ca5d75fe5f16c1e182 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 30 Jul 2023 21:04:52 -0700
Subject: [PATCH] actually use the new windows workflow

---
 .github/workflows/build-linux.yml |  5 ++---
 .github/workflows/build.yml       | 34 ++++++-------------------------
 2 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index 7d389f1e7..a32c4b474 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -62,7 +62,7 @@ jobs:
         if: inputs.platform-files
         uses: actions/cache@v3
         with:
-          path: ~/.ccache
+          path: ~/.cache/ccache
           key: linux-gcc-${{ inputs.gcc-ver }}-${{ inputs.cache-id }}-${{ github.sha }}
           restore-keys: |
             linux-gcc-${{ inputs.gcc-ver }}-${{ inputs.cache-id }}
@@ -71,7 +71,6 @@ jobs:
         env:
           CC: gcc-${{ inputs.gcc-ver }}
           CXX: g++-${{ inputs.gcc-ver }}
-          CCACHE_DIR: ${{ github.env.HOME }}/.ccache
         run: |
           cmake \
             -S . \
@@ -100,7 +99,7 @@ jobs:
         run: |
           ccache --max-size 50M
           ccache --cleanup
-          ccache --show-stats
+          ccache --show-stats --verbose
       - name: Format artifact name
         if: inputs.append-date-and-hash
         id: artifactname
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1c9f4b13f..6bae140a5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,34 +85,12 @@ jobs:
 
   package-win64:
     name: Win64 package (native)
-    runs-on: windows-latest
-    steps:
-      - run: pip install clcache
-      - run: pip install 'sphinx<4.4.0'
-      - name: Fetch cache
-        uses: actions/cache@v3
-        with:
-          path: ~/clcache
-          key: clcache-win64-${{ github.sha }}
-          restore-keys: |
-            clcache-win64
-      - name: Clone DFHack
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-          fetch-depth: 0
-      - name: Configure DFHack
-        run: cmake -S . -B build -G "Visual Studio 17 2022" -DCMAKE_INSTALL_PREFIX=build/image -DCMAKE_C_COMPILER_LAUNCHER=clcache -DCMAKE_CXX_COMPILER_LAUNCHER=clcache -DBUILD_DOCS:BOOL=1 -DBUILD_STONESENSE:BOOL=1
-      - name: Build DFHack
-        run: cmake --build build -j 2 --config Release --target install
-      - name: Format artifact name
-        uses: benjlevesque/short-sha@v2.2
-        id: short-sha
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: dfhack-win64-build-${{ steps.short-sha.outputs.sha }}
-          path: build/image/*
+    uses: ./.github/workflows/build-windows.yml
+    with:
+      artifact-name: dfhack-win64
+      append-date-and-hash: true
+      cache-id: msvc
+    secrets: inherit
 
   build-cross-win64:
     name: Win64 package