Merge branch 'develop' into sdl_console

Author: dhthwy

.github/workflows/generate-symbols.yml

@@ -36,6 +36,7 @@ on:
         default: default
         options:
         - default
+        - experimental
         - testing
         - adventure_test
         - beta
@@ -133,7 +134,7 @@ jobs:
           +quit
         tar xjf dfhack-symbols-linux64-build.tar.bz2 -C DF_steam
         xml/symbols_gen_linux.sh ${{ inputs.version == 'auto' && '50.0' || inputs.version }} STEAM DF_steam
-        if [ "${{ inputs.version }}" = "auto" ]; then
+        if [ "${{ inputs.version }}" == "auto" ]; then
           while pgrep dwarfort; do
             echo "waiting for DF to exit"
             sleep 0.5

.github/workflows/watch-df-release.yml

@@ -15,13 +15,17 @@ jobs:
       fail-fast: false
       matrix:
         # df_steam_branch: which DF Steam branch to watch
-        # platform: leave blank to default to all
+        # platform: for symbols generation; leave blank to default to all
         # structures_ref: leave blank to default to master
         # dfhack_ref: leave blank if no structures update is desired
         # steam_branch: leave blank if no DFHack steam push is desired
         include:
           - df_steam_branch: public
           - df_steam_branch: beta
+          - df_steam_branch: experimental
+            structures_ref: experimental
+            dfhack_ref: experimental
+            steam_branch: experimental
     steps:
     - name: Fetch state
       uses: actions/cache/restore@v4
@@ -31,7 +35,8 @@ jobs:
     - name: Compare branch metadata
       uses: nick-fields/retry@v3
       with:
-        timeout_minutes: 2
+        timeout_minutes: 5
+        retry_wait_seconds: 60
         command: |
           blob=$(wget 'https://api.steamcmd.net/v1/info/975370?pretty=1' -O- | \
               awk '/^ *"branches"/,0' | \
@@ -117,7 +122,8 @@ jobs:
     - name: Compare versions
       uses: nick-fields/retry@v3
       with:
-        timeout_minutes: 2
+        timeout_minutes: 5
+        retry_wait_seconds: 60
         command: |
           version=$(wget "${{ matrix.url }}" -qO- | tr '"' '\n' | fgrep 'tar.bz2' | head -n1 | sed -r 's/${{ matrix.prefix }}_([0-9]{2})_([0-9]{2})_linux.tar.bz2/\1.\2/')
           echo "latest ${{ matrix.channel }} version: $version"

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 repos:
 # shared across repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v5.0.0
+  rev: v6.0.0
   hooks:
     - id: check-added-large-files
     - id: check-case-conflict
@@ -20,7 +20,7 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.30.0
+  rev: 0.33.3
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks

CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_policy(SET CMP0048 NEW)
 cmake_policy(SET CMP0074 NEW)
 
 # set up versioning.
-set(DF_VERSION "51.04")
+set(DF_VERSION "52.04")
 set(DFHACK_RELEASE "r1")
 set(DFHACK_PRERELEASE FALSE)
 
@@ -67,7 +67,7 @@ endif()
 
 if(WIN32)
     set(MSVC_MIN_VER 1930)
-    set(MSVC_MAX_VER 1942)
+    set(MSVC_MAX_VER 1944)
     if(NOT MSVC)
         message(SEND_ERROR "No MSVC found! MSVC 2022 version ${MSVC_MIN_VER} to ${MSVC_MAX_VER} is required.")
     elseif((MSVC_VERSION LESS MSVC_MIN_VER) OR (MSVC_VERSION GREATER MSVC_MAX_VER))

build/.gitignore

@@ -7,3 +7,4 @@ _CPack_Packages
 *.tar.*
 .cmake
 win64-cross
+dest

ci/test.lua

@@ -6,6 +6,7 @@ local gui = require('gui')
 local helpdb = require('helpdb')
 local json = require('json')
 local mock = require('test_util.mock')
+local overlay = require('plugins.overlay')
 local script = require('gui.script')
 local utils = require('utils')
 
@@ -289,12 +290,13 @@ local MODES = {
 
 local function load_test_config(config_file)
     local config = {}
+    print ("loading test config from " .. config_file)
     if dfhack.filesystem.isfile(config_file) then
         config = json.decode_file(config_file)
     end
 
     if not config.test_dir then
-        config.test_dir = dfhack.getHackPath() .. 'scripts/test'
+        config.test_dir = dfhack.getHackPath() .. '/scripts/test'
     end
 
     if not config.save_dir then
@@ -426,6 +428,7 @@ end
 
 local function finish_tests(done_command)
     dfhack.internal.IN_TEST = false
+    overlay.rescan()
     if done_command and #done_command > 0 then
         dfhack.run_command(done_command)
     end

data/CMakeLists.txt

@@ -24,6 +24,10 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/blueprints/
         FILES_MATCHING PATTERN "*"
                        PATTERN blueprints/test EXCLUDE)
 
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/patches/
+    DESTINATION ${DFHACK_DATA_DESTINATION}/patches
+)
+
 if(BUILD_TESTS)
     install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/blueprints/test/
             DESTINATION "${DFHACK_DATA_DESTINATION}/data/blueprints/test")