prep for building from structures repo

develop
Myk Taylor 2023-08-03 01:09:57 -07:00
parent f5dfa03c49
commit 088c7a17b7
No known key found for this signature in database
4 changed files with 22 additions and 5 deletions

@ -7,6 +7,8 @@ on:
type: string type: string
scripts_ref: scripts_ref:
type: string type: string
structures_ref:
type: string
artifact-name: artifact-name:
type: string type: string
append-date-and-hash: append-date-and-hash:
@ -74,6 +76,13 @@ jobs:
repository: 'DFHack/scripts' repository: 'DFHack/scripts'
ref: ${{ inputs.scripts_ref }} ref: ${{ inputs.scripts_ref }}
path: scripts 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 - name: Fetch ccache
if: inputs.platform-files if: inputs.platform-files
uses: actions/cache/restore@v3 uses: actions/cache/restore@v3

@ -3,9 +3,10 @@ name: Build win64
on: on:
workflow_call: workflow_call:
inputs: inputs:
ref: dfhack_ref:
type: string
structures_ref:
type: string type: string
default: ''
artifact-name: artifact-name:
type: string type: string
append-date-and-hash: append-date-and-hash:
@ -36,9 +37,16 @@ jobs:
- name: Clone DFHack - name: Clone DFHack
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
ref: ${{ inputs.ref }} ref: ${{ inputs.dfhack_ref }}
submodules: true submodules: true
fetch-depth: 0 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 - name: Get 3rd party SDKs
if: inputs.launchdf if: inputs.launchdf
uses: actions/checkout@v3 uses: actions/checkout@v3

@ -17,7 +17,7 @@ jobs:
uses: ./.github/workflows/build-windows.yml uses: ./.github/workflows/build-windows.yml
with: with:
artifact-name: win64-release 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-id: release
cache-readonly: true cache-readonly: true
launchdf: true launchdf: true

@ -39,7 +39,7 @@ jobs:
uses: ./.github/workflows/build-windows.yml uses: ./.github/workflows/build-windows.yml
with: with:
artifact-name: win64-depot 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-id: release
cache-readonly: true cache-readonly: true
common-files: false common-files: false