diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index acd7db7ce..fd1ac3e13 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -5,6 +5,8 @@ on: inputs: dfhack_ref: type: string + scripts_ref: + type: string structures_ref: type: string artifact-name: @@ -21,6 +23,12 @@ on: common-files: type: boolean default: true + docs: + type: boolean + default: false + stonesense: + type: boolean + default: false launchdf: type: boolean default: false @@ -40,6 +48,13 @@ jobs: ref: ${{ inputs.dfhack_ref }} submodules: true 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 if: inputs.structures_ref uses: actions/checkout@v3 @@ -65,7 +80,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=${{ 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: | cd build bash -x build-win64-from-linux.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4227c3f04..051fc55b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,8 @@ jobs: artifact-name: dfhack-win64-build append-date-and-hash: true cache-id: release + stonesense: true + docs: true secrets: inherit docs: diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 692292125..56bc26702 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -20,6 +20,8 @@ jobs: dfhack_ref: ${{ github.event.inputs && github.event.inputs.ref || github.event.ref }} cache-id: release cache-readonly: true + stonesense: true + docs: true launchdf: true secrets: inherit diff --git a/.github/workflows/steam-deploy.yml b/.github/workflows/steam-deploy.yml index a44c0295f..5b14d0bc8 100644 --- a/.github/workflows/steam-deploy.yml +++ b/.github/workflows/steam-deploy.yml @@ -43,6 +43,7 @@ jobs: cache-id: release cache-readonly: true common-files: false + stonesense: true launchdf: true secrets: inherit diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e5c884e64..219273350 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,6 +16,7 @@ jobs: uses: ./.github/workflows/build-windows.yml with: dfhack_ref: ${{ inputs.dfhack_ref }} + scripts_ref: ${{ inputs.scripts_ref }} structures_ref: ${{ inputs.structures_ref }} artifact-name: test-msvc cache-id: test @@ -54,7 +55,9 @@ jobs: with: repository: 'DFHack/dfhack' ref: ${{ inputs.dfhack_ref }} - sparse-checkout: CMakeLists.txt + sparse-checkout: | + CMakeLists.txt + ci/ - name: Detect DF version id: get-df-version run: echo ver="$(sh ci/get-df-version.sh)" >> $GITHUB_OUTPUT