actually install the tests for the test action

develop
Myk Taylor 2023-08-03 08:05:13 -07:00
parent 5f5981f067
commit 2b7865a0e4
No known key found for this signature in database
3 changed files with 10 additions and 1 deletions

@ -35,6 +35,9 @@ on:
extras: extras:
type: boolean type: boolean
default: false default: false
tests:
type: boolean
default: false
gcc-ver: gcc-ver:
type: string type: string
default: "10" default: "10"
@ -112,6 +115,7 @@ jobs:
-DBUILD_SIZECHECK:BOOL=${{ inputs.extras }} \ -DBUILD_SIZECHECK:BOOL=${{ inputs.extras }} \
-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 }} \
-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

@ -29,6 +29,9 @@ on:
stonesense: stonesense:
type: boolean type: boolean
default: false default: false
tests:
type: boolean
default: false
launchdf: launchdf:
type: boolean type: boolean
default: false default: false
@ -80,7 +83,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 }}' 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 }}'
run: | run: |
cd build cd build
bash -x build-win64-from-linux.sh bash -x build-win64-from-linux.sh

@ -20,6 +20,7 @@ jobs:
structures_ref: ${{ inputs.structures_ref }} structures_ref: ${{ inputs.structures_ref }}
artifact-name: test-msvc artifact-name: test-msvc
cache-id: test cache-id: test
tests: true
build-linux: build-linux:
name: Linux gcc-${{ matrix.gcc }} name: Linux gcc-${{ matrix.gcc }}
@ -32,6 +33,7 @@ jobs:
cache-id: test cache-id: test
stonesense: ${{ matrix.plugins == 'all' }} stonesense: ${{ matrix.plugins == 'all' }}
extras: ${{ matrix.plugins == 'all' }} extras: ${{ matrix.plugins == 'all' }}
tests: true
gcc-ver: ${{ matrix.gcc }} gcc-ver: ${{ matrix.gcc }}
secrets: inherit secrets: inherit
strategy: strategy: