From 088c7a17b779cd19a0109ea4db352af836746602 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Thu, 3 Aug 2023 01:09:57 -0700
Subject: [PATCH] prep for building from structures repo

---
 .github/workflows/build-linux.yml    |  9 +++++++++
 .github/workflows/build-windows.yml  | 14 +++++++++++---
 .github/workflows/github-release.yml |  2 +-
 .github/workflows/steam-deploy.yml   |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index d9ead04ce..ac0ee3308 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -7,6 +7,8 @@ on:
         type: string
       scripts_ref:
         type: string
+      structures_ref:
+        type: string
       artifact-name:
         type: string
       append-date-and-hash:
@@ -74,6 +76,13 @@ jobs:
           repository: 'DFHack/scripts'
           ref: ${{ inputs.scripts_ref }}
           path: scripts
+      - name: Clone structures
+        if: inputs.structures_ref
+        uses: actions/checkout@v3
+        with:
+          repository: 'DFHack/df-structures'
+          ref: ${{ inputs.structures_ref }}
+          path: library/xml
       - name: Fetch ccache
         if: inputs.platform-files
         uses: actions/cache/restore@v3
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 22c1e8210..acd7db7ce 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -3,9 +3,10 @@ name: Build win64
 on:
   workflow_call:
     inputs:
-      ref:
+      dfhack_ref:
+        type: string
+      structures_ref:
         type: string
-        default: ''
       artifact-name:
         type: string
       append-date-and-hash:
@@ -36,9 +37,16 @@ jobs:
       - name: Clone DFHack
         uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.ref }}
+          ref: ${{ inputs.dfhack_ref }}
           submodules: true
           fetch-depth: 0
+      - name: Clone structures
+        if: inputs.structures_ref
+        uses: actions/checkout@v3
+        with:
+          repository: 'DFHack/df-structures'
+          ref: ${{ inputs.structures_ref }}
+          path: library/xml
       - name: Get 3rd party SDKs
         if: inputs.launchdf
         uses: actions/checkout@v3
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
index 7ec362dec..692292125 100644
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -17,7 +17,7 @@ jobs:
     uses: ./.github/workflows/build-windows.yml
     with:
       artifact-name: win64-release
-      ref: ${{ github.event.inputs && github.event.inputs.ref || github.event.ref }}
+      dfhack_ref: ${{ github.event.inputs && github.event.inputs.ref || github.event.ref }}
       cache-id: release
       cache-readonly: true
       launchdf: true
diff --git a/.github/workflows/steam-deploy.yml b/.github/workflows/steam-deploy.yml
index d33ad3588..a44c0295f 100644
--- a/.github/workflows/steam-deploy.yml
+++ b/.github/workflows/steam-deploy.yml
@@ -39,7 +39,7 @@ jobs:
     uses: ./.github/workflows/build-windows.yml
     with:
       artifact-name: win64-depot
-      ref: ${{ github.event.inputs && github.event.inputs.ref || github.event.ref }}
+      dfhack_ref: ${{ github.event.inputs && github.event.inputs.ref || github.event.ref }}
       cache-id: release
       cache-readonly: true
       common-files: false