Merge pull request #3645 from myk002/myk_test_blank

do a test run with blank init scripts
develop
Myk 2023-08-06 23:56:37 -07:00 committed by GitHub
commit 5b7458cddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions

@ -50,7 +50,7 @@ jobs:
plugins: "all" plugins: "all"
run-tests: run-tests:
name: Test (${{ matrix.os }}, ${{ matrix.compiler }}, ${{ matrix.plugins }} plugins) name: Test (${{ matrix.os }}, ${{ matrix.compiler }}, ${{ matrix.plugins }} plugins, ${{ matrix.config }} config)
needs: needs:
- build-windows - build-windows
- build-linux - build-linux
@ -62,15 +62,20 @@ jobs:
- os: windows - os: windows
compiler: msvc compiler: msvc
plugins: "default" plugins: "default"
config: "default"
- os: windows
compiler: msvc
plugins: "default"
config: "empty"
# TODO: uncomment once we have a linux build we can download from bay12 # TODO: uncomment once we have a linux build we can download from bay12
# - os: ubuntu # - os: ubuntu
# compiler: gcc-10 # compiler: gcc-10
# gcc: 10
# plugins: "default" # plugins: "default"
# config: "default"
# - os: ubuntu # - os: ubuntu
# compiler: gcc-10 # compiler: gcc-12
# gcc: 12
# plugins: "all" # plugins: "all"
# config: "default"
steps: steps:
- name: Set env - name: Set env
shell: bash shell: bash
@ -98,6 +103,13 @@ jobs:
with: with:
path: ${{ env.DF_FOLDER }} path: ${{ env.DF_FOLDER }}
key: df-${{ matrix.os }}-${{ env.DF_VERSION }}-${{ hashFiles('ci/download-df.sh') }} key: df-${{ matrix.os }}-${{ env.DF_VERSION }}-${{ hashFiles('ci/download-df.sh') }}
- name: Install blank DFHack init scripts
if: matrix.config == 'empty'
shell: bash
run: |
mkdir -p ${{ env.DF_FOLDER }}/dfhack-config/init
cd data/dfhack-config/init
for fname in *.init; do touch ../../../${{ env.DF_FOLDER }}/dfhack-config/init/$fname; done
- name: Download DFHack - name: Download DFHack
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
@ -113,7 +125,7 @@ jobs:
if: always() if: always()
continue-on-error: true continue-on-error: true
with: with:
name: test-artifacts-msvc name: test-output-${{ matrix.compiler }}-${{ matrix.plugins }}_plugins-${{ matrix.config }}_config
path: | path: |
${{ env.DF_FOLDER }}/dfhack-rpc.txt ${{ env.DF_FOLDER }}/dfhack-rpc.txt
${{ env.DF_FOLDER }}/test*.json ${{ env.DF_FOLDER }}/test*.json

@ -83,7 +83,6 @@ test_init_file = os.path.join(init_path, 'dfhackzzz_test.init') # Core sorts th
with open(test_init_file, 'w') as f: with open(test_init_file, 'w') as f:
f.write(''' f.write('''
devel/dump-rpc dfhack-rpc.txt devel/dump-rpc dfhack-rpc.txt
:lua dfhack.internal.addScriptPath(dfhack.getHackPath())
test --resume -- lua scr.breakdown_level=df.interface_breakdown_types.%s test --resume -- lua scr.breakdown_level=df.interface_breakdown_types.%s
''' % ('NONE' if args.no_quit else 'QUIT')) ''' % ('NONE' if args.no_quit else 'QUIT'))