Revert "always build launchdf"

This reverts commit a509bb5e61.
develop
Myk Taylor 2023-07-31 04:02:12 -07:00
parent e3a8009717
commit cf0b87fbc4
No known key found for this signature in database
2 changed files with 6 additions and 1 deletions

@ -20,6 +20,9 @@ on:
common-files: common-files:
type: boolean type: boolean
default: true default: true
launchdf:
type: boolean
default: false
jobs: jobs:
build-win64: build-win64:
@ -37,6 +40,7 @@ jobs:
submodules: true submodules: true
fetch-depth: 0 fetch-depth: 0
- name: Get 3rd party SDKs - name: Get 3rd party SDKs
if: inputs.launchdf
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
repository: DFHack/3rdparty repository: DFHack/3rdparty
@ -53,7 +57,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=1' 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 }}'
run: | run: |
cd build cd build
bash -x build-win64-from-linux.sh bash -x build-win64-from-linux.sh

@ -39,6 +39,7 @@ jobs:
cache-id: release cache-id: release
cache-readonly: true cache-readonly: true
common-files: false common-files: false
launchdf: true
secrets: inherit secrets: inherit
depot-linux64: depot-linux64: