MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow the reusable workflows to build xml-dump-type-sizes

develop
Myk Taylor 2023-08-04 16:56:06 -07:00
parent 0ef1a475e4
commit c5ad5d0913
No known key found for this signature in database
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build-linux.yml vendored
Unescape Escape View File

@ -38,6 +38,9 @@ on:
tests: tests:
type: boolean type: boolean
default: false default: false
xml-dump-type-sizes:
type: boolean
default: false
gcc-ver: gcc-ver:
type: string type: string
default: "10" default: "10"
@ -52,7 +55,7 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install ninja-build sudo apt-get install ninja-build
- name: Install binary build dependencies - name: Install binary build dependencies
if: inputs.platform-files if: inputs.platform-files || inputs.xml-dump-type-sizes
run: | run: |
sudo apt-get install \ sudo apt-get install \
ccache \ ccache \
@ -116,6 +119,7 @@ jobs:
-DBUILD_SKELETON:BOOL=${{ inputs.extras }} \ -DBUILD_SKELETON:BOOL=${{ inputs.extras }} \
-DBUILD_DOCS:BOOL=${{ inputs.docs }} \ -DBUILD_DOCS:BOOL=${{ inputs.docs }} \
-DBUILD_TESTS:BOOL=${{ inputs.tests }} \ -DBUILD_TESTS:BOOL=${{ inputs.tests }} \
-DBUILD_XMLDUMP:BOOL=${{ inputs.xml-dump-type-sizes }} \
-DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} \ -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} \
-DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }} -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }}
- name: Build DFHack - name: Build DFHack

11
.github/workflows/build-windows.yml vendored
Unescape Escape View File

@ -20,6 +20,9 @@ on:
cache-readonly: cache-readonly:
type: boolean type: boolean
default: false default: false
platform-files:
type: boolean
default: true
common-files: common-files:
type: boolean type: boolean
default: true default: true
@ -32,6 +35,9 @@ on:
tests: tests:
type: boolean type: boolean
default: false default: false
xml-dump-type-sizes:
type: boolean
default: false
launchdf: launchdf:
type: boolean type: boolean
default: false default: false
@ -75,6 +81,7 @@ jobs:
ssh-key: ${{ secrets.DFHACK_3RDPARTY_TOKEN }} ssh-key: ${{ secrets.DFHACK_3RDPARTY_TOKEN }}
path: depends/steam path: depends/steam
- name: Fetch ccache - name: Fetch ccache
if: inputs.platform-files
uses: actions/cache/restore@v3 uses: actions/cache/restore@v3
with: with:
path: build/win64-cross/ccache path: build/win64-cross/ccache
@ -84,7 +91,7 @@ jobs:
win-msvc win-msvc
- name: Cross-compile - name: Cross-compile
env: env:
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 }} -DBUILD_TESTS:BOOL=${{ inputs.tests }}' CMAKE_EXTRA_ARGS: '-DBUILD_LIBRARY=${{ inputs.platform-files }} -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 }} -DBUILD_TESTS:BOOL=${{ inputs.tests }} -DBUILD_XMLDUMP:BOOL=${{ inputs.xml-dump-type-sizes }}'
run: | run: |
cd build cd build
bash -x build-win64-from-linux.sh bash -x build-win64-from-linux.sh
@ -95,7 +102,7 @@ jobs:
ccache -d win64-cross/ccache --cleanup ccache -d win64-cross/ccache --cleanup
ccache -d win64-cross/ccache --show-stats --verbose ccache -d win64-cross/ccache --show-stats --verbose
- name: Save ccache - name: Save ccache
if: '!inputs.cache-readonly' if: inputs.platform-files && !inputs.cache-readonly
uses: actions/cache/save@v3 uses: actions/cache/save@v3
with: with:
path: build/win64-cross/ccache path: build/win64-cross/ccache