Merge branch 'develop' into adv-beta

DFHack · Nov 30, 2024 · feac0fe · feac0fe
2 parents 8353f0a + 057c3fa
commit feac0fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/generate-symbols.yml b/.github/workflows/generate-symbols.yml
@@ -145,7 +145,7 @@ jobs:
             echo "waiting for DF to start"
             sleep 0.5
           done
-          df_ver=`./dfhack-run lua print(dfhack.gui.getDFViewscreen(true).str_version)`
+          df_ver=`./dfhack-run lua 'print(dfhack.gui.getDFViewscreen(true).str_version)'`
           sed -i "s/v0.50.0 linux64 STEAM/v0.${df_ver} linux64 STEAM/" ../xml/symbols.xml
         fi
 
@@ -353,7 +353,7 @@ jobs:
           echo "waiting for DF to start"
           sleep 0.5
         done
-        df_ver=`./dfhack-run.exe lua print(dfhack.gui.getDFViewscreen(true).str_version)`
+        df_ver=`./dfhack-run.exe lua 'print(dfhack.gui.getDFViewscreen(true).str_version)'`
         sed -i "s/v0.50.0 win64 STEAM/v0.${df_ver} win64 STEAM/" ../xml/symbols.xml
     - name: Merge updates
       shell: bash

diff --git a/.github/workflows/watch-df-steam.yml b/.github/workflows/watch-df-steam.yml
@@ -82,4 +82,4 @@ jobs:
       if: env.TIMESTAMP
       with:
         path: state
-        key: watchstate-${{ matrix.version }}-${{ env.TIMESTAMP }}
+        key: watchstate-${{ matrix.df_steam_branch }}-${{ env.TIMESTAMP }}