From a509bb5e61d4a37a063a2d4488ec09b0c90590cf Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Mon, 31 Jul 2023 03:01:11 -0700 Subject: [PATCH] always build launchdf --- .github/workflows/build-windows.yml | 6 +----- .github/workflows/steam.yml | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 8fe4502e4..e1076b161 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -20,9 +20,6 @@ on: common-files: type: boolean default: true - launchdf: - type: boolean - default: false jobs: build-win64: @@ -40,7 +37,6 @@ jobs: submodules: true fetch-depth: 0 - name: Get 3rd party SDKs - if: inputs.launchdf uses: actions/checkout@v3 with: repository: DFHack/3rdparty @@ -57,7 +53,7 @@ jobs: win-msvc - name: Cross-compile 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=1 -DBUILD_DOCS:BOOL=${{ inputs.common-files }} -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }} -DBUILD_DFLAUNCH:BOOL=1' run: | cd build bash -x build-win64-from-linux.sh diff --git a/.github/workflows/steam.yml b/.github/workflows/steam.yml index 1801ad33f..cbf311c7d 100644 --- a/.github/workflows/steam.yml +++ b/.github/workflows/steam.yml @@ -52,7 +52,6 @@ jobs: cache-id: release cache-readonly: true common-files: false - launchdf: true secrets: inherit deploy-to-steam: