Merge branch 'DFHack:develop' into Bumber64-patch-2

develop
Ryan Williams 2022-06-07 04:21:56 -07:00 committed by GitHub
commit 46438a2af3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 12 deletions

@ -60,14 +60,15 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ~/DF path: ~/DF
key: ${{ steps.env_setup.outputs.df_version }} key: ${{ steps.env_setup.outputs.df_version }}-${{ hashFiles('ci/download-df.sh') }}
- name: Fetch ccache - name: Fetch ccache
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.sha }} key: ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.ref_name }}-${{ github.sha }}
restore-keys: | restore-keys: |
ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }} ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.ref_name }}
ccache-v2-${{ matrix.os }}-gcc-${{ matrix.gcc }}
- name: Download DF - name: Download DF
run: | run: |
sh ci/download-df.sh sh ci/download-df.sh

@ -20,11 +20,11 @@ repos:
args: ['--fix=lf'] args: ['--fix=lf']
- id: trailing-whitespace - id: trailing-whitespace
- repo: https://github.com/python-jsonschema/check-jsonschema - repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.14.3 rev: 0.16.0
hooks: hooks:
- id: check-github-workflows - id: check-github-workflows
- repo: https://github.com/Lucas-C/pre-commit-hooks - repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.1.13 rev: v1.2.0
hooks: hooks:
- id: forbid-tabs - id: forbid-tabs
exclude_types: exclude_types:

@ -2,4 +2,4 @@
description=integration test for the gui/quantum script description=integration test for the gui/quantum script
width=5 width=5
height=5 height=5
extra_fn=test_gui_quantum extra_fn=gui_quantum

1 #notes
2 description=integration test for the gui/quantum script
3 width=5
4 height=5
5 extra_fn=test_gui_quantum extra_fn=gui_quantum

@ -1 +1 @@
Subproject commit a24581cc5318bdbc6227f368f67bc03a9082c19c Subproject commit 51991bb39224fee8111fc5edce026dcbabf078ad

@ -1 +1 @@
Subproject commit 52e21c5e0c78e17acdad23f94efffb043290d5b5 Subproject commit 5ae30f01d9d96453d6ef435d018686db4b4a76f7

@ -10,8 +10,10 @@
-- height (required) -- height (required)
-- depth (default is 1) -- depth (default is 1)
-- start (cursor offset for input blueprints, default is 1,1) -- start (cursor offset for input blueprints, default is 1,1)
-- extra_fn (the name of a global function in this file to run after applying -- extra_fn (the name of a function in the extra_fns table in this file to
-- all blueprints but before comparing results) -- run after applying all blueprints but before comparing results.
-- this function will get the map coordinate of the upper-left
-- corner of the test area passed to it)
-- --
-- depends on blueprint, buildingplan, and dig-now plugins (as well as the -- depends on blueprint, buildingplan, and dig-now plugins (as well as the
-- quickfort script and anything else run in the extra_fns, of course) -- quickfort script and anything else run in the extra_fns, of course)
@ -301,6 +303,8 @@ local function do_dig_phase(phase_data, area, spec)
run_dig_now(area) run_dig_now(area)
end end
local extra_fns = {}
function test.end_to_end() function test.end_to_end()
-- read in test plan -- read in test plan
local sets = get_blueprint_sets() local sets = get_blueprint_sets()
@ -330,7 +334,7 @@ function test.end_to_end()
-- run any extra commands, if defined by the blueprint spec -- run any extra commands, if defined by the blueprint spec
if spec.extra_fn then if spec.extra_fn then
_ENV[spec.extra_fn](area.pos) extra_fns[spec.extra_fn](area.pos)
end end
-- run blueprint to generate files in output dir -- run blueprint to generate files in output dir
@ -387,7 +391,7 @@ local function send_keys(...)
end end
end end
function test_gui_quantum(pos) function extra_fns.gui_quantum(pos)
local vehicles = assign_minecarts.get_free_vehicles() local vehicles = assign_minecarts.get_free_vehicles()
local confirm_state = confirm.isEnabled() local confirm_state = confirm.isEnabled()
local confirm_conf = confirm.get_conf_data() local confirm_conf = confirm.get_conf_data()