trim windows test build

develop
Myk Taylor 2023-08-03 04:13:06 -07:00
parent 55f1b0d48e
commit 819cd53e1d
No known key found for this signature in database
5 changed files with 25 additions and 2 deletions

@ -5,6 +5,8 @@ on:
inputs: inputs:
dfhack_ref: dfhack_ref:
type: string type: string
scripts_ref:
type: string
structures_ref: structures_ref:
type: string type: string
artifact-name: artifact-name:
@ -21,6 +23,12 @@ on:
common-files: common-files:
type: boolean type: boolean
default: true default: true
docs:
type: boolean
default: false
stonesense:
type: boolean
default: false
launchdf: launchdf:
type: boolean type: boolean
default: false default: false
@ -40,6 +48,13 @@ jobs:
ref: ${{ inputs.dfhack_ref }} ref: ${{ inputs.dfhack_ref }}
submodules: true submodules: true
fetch-depth: 0 fetch-depth: 0
- name: Clone scripts
if: inputs.scripts_ref
uses: actions/checkout@v3
with:
repository: 'DFHack/scripts'
ref: ${{ inputs.scripts_ref }}
path: scripts
- name: Clone structures - name: Clone structures
if: inputs.structures_ref if: inputs.structures_ref
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -65,7 +80,7 @@ jobs:
win-msvc win-msvc
- name: Cross-compile - name: Cross-compile
env: env:
CMAKE_EXTRA_ARGS: '-DBUILD_STONESENSE:BOOL=1 -DBUILD_DOCS:BOOL=${{ inputs.common-files }} -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }} -DBUILD_DFLAUNCH:BOOL=${{ inputs.launchdf }}' CMAKE_EXTRA_ARGS: '-DBUILD_STONESENSE:BOOL=${{ inputs.stonesense }} -DBUILD_DOCS:BOOL=${{ inputs.docs }} -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }} -DBUILD_DFLAUNCH:BOOL=${{ inputs.launchdf }}'
run: | run: |
cd build cd build
bash -x build-win64-from-linux.sh bash -x build-win64-from-linux.sh

@ -25,6 +25,8 @@ jobs:
artifact-name: dfhack-win64-build artifact-name: dfhack-win64-build
append-date-and-hash: true append-date-and-hash: true
cache-id: release cache-id: release
stonesense: true
docs: true
secrets: inherit secrets: inherit
docs: docs:

@ -20,6 +20,8 @@ jobs:
dfhack_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
stonesense: true
docs: true
launchdf: true launchdf: true
secrets: inherit secrets: inherit

@ -43,6 +43,7 @@ jobs:
cache-id: release cache-id: release
cache-readonly: true cache-readonly: true
common-files: false common-files: false
stonesense: true
launchdf: true launchdf: true
secrets: inherit secrets: inherit

@ -16,6 +16,7 @@ jobs:
uses: ./.github/workflows/build-windows.yml uses: ./.github/workflows/build-windows.yml
with: with:
dfhack_ref: ${{ inputs.dfhack_ref }} dfhack_ref: ${{ inputs.dfhack_ref }}
scripts_ref: ${{ inputs.scripts_ref }}
structures_ref: ${{ inputs.structures_ref }} structures_ref: ${{ inputs.structures_ref }}
artifact-name: test-msvc artifact-name: test-msvc
cache-id: test cache-id: test
@ -54,7 +55,9 @@ jobs:
with: with:
repository: 'DFHack/dfhack' repository: 'DFHack/dfhack'
ref: ${{ inputs.dfhack_ref }} ref: ${{ inputs.dfhack_ref }}
sparse-checkout: CMakeLists.txt sparse-checkout: |
CMakeLists.txt
ci/
- name: Detect DF version - name: Detect DF version
id: get-df-version id: get-df-version
run: echo ver="$(sh ci/get-df-version.sh)" >> $GITHUB_OUTPUT run: echo ver="$(sh ci/get-df-version.sh)" >> $GITHUB_OUTPUT