From cf0b87fbc463b0c5f65b4b16dc8134d991598a7f Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Mon, 31 Jul 2023 04:02:12 -0700 Subject: [PATCH] Revert "always build launchdf" This reverts commit a509bb5e61d4a37a063a2d4488ec09b0c90590cf. --- .github/workflows/build-windows.yml | 6 +++++- .github/workflows/steam-deploy.yml | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index e1076b161..8fe4502e4 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -20,6 +20,9 @@ on: common-files: type: boolean default: true + launchdf: + type: boolean + default: false jobs: build-win64: @@ -37,6 +40,7 @@ jobs: submodules: true fetch-depth: 0 - name: Get 3rd party SDKs + if: inputs.launchdf uses: actions/checkout@v3 with: repository: DFHack/3rdparty @@ -53,7 +57,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=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: | cd build bash -x build-win64-from-linux.sh diff --git a/.github/workflows/steam-deploy.yml b/.github/workflows/steam-deploy.yml index 006c05ec1..ef1433212 100644 --- a/.github/workflows/steam-deploy.yml +++ b/.github/workflows/steam-deploy.yml @@ -39,6 +39,7 @@ jobs: cache-id: release cache-readonly: true common-files: false + launchdf: true secrets: inherit depot-linux64: