Merge pull request #1570 from dsnopek/4.2-cherrypicks-7

Cherry-picks for the godot-cpp 4.2 branch - 7th batch

Author: dsnopek

.github/actions/godot-cache/action.yml renamed to .github/actions/godot-cache-restore/action.yml

@@ -1,5 +1,5 @@
-name: Setup Godot build cache
-description: Setup Godot build cache.
+name: Restore Godot build cache
+description: Restore Godot build cache.
 inputs:
  cache-name:
  description: The cache base name (job name by default).
@@ -10,9 +10,8 @@ inputs:
 runs:
  using: "composite"
  steps:
- # Upload cache on completion and check it out now
- - name: Load .scons_cache directory
- uses: actions/cache@v3
+ - name: Restore .scons_cache directory
+ uses: actions/cache/restore@v3
  with:
  path: ${{inputs.scons-cache}}
  key: ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}

.github/actions/godot-cache-save/action.yml

@@ -0,0 +1,17 @@
+name: Save Godot build cache
+description: Save Godot build cache.
+inputs:
+ cache-name:
+ description: The cache base name (job name by default).
+ default: "${{github.job}}"
+ scons-cache:
+ description: The SCons cache path.
+ default: "${{github.workspace}}/.scons-cache/"
+runs:
+ using: "composite"
+ steps:
+ - name: Save SCons cache directory
+ uses: actions/cache/save@v4
+ with:
+ path: ${{inputs.scons-cache}}
+ key: ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}

.github/workflows/ci.yml

@@ -99,8 +99,8 @@ jobs:
  with:
  submodules: recursive
 
- - name: Setup Godot build cache
- uses: ./.github/actions/godot-cache
+ - name: Restore Godot build cache
+ uses: ./.github/actions/godot-cache-restore
  with:
  cache-name: ${{ matrix.cache-name }}
  continue-on-error: true
@@ -153,6 +153,12 @@ jobs:
  cd test
  scons platform=${{ matrix.platform }} verbose=yes target=template_release ${{ matrix.flags }}
 
+ - name: Save Godot build cache
+ uses: ./.github/actions/godot-cache-save
+ with:
+ cache-name: ${{ matrix.cache-name }}
+ continue-on-error: true
+
  - name: Download latest Godot artifacts
  uses: dsnopek/action-download-artifact@1322f74e2dac9feed2ee76a32d9ae1ca3b4cf4e9
  if: ${{ matrix.run-tests && env.GODOT_TEST_VERSION == 'master' }}

CMakeLists.txt

@@ -5,6 +5,7 @@
 # GODOT_GDEXTENSION_DIR:	Path to the directory containing GDExtension interface header and API JSON file
 # GODOT_CPP_SYSTEM_HEADERS	Mark the header files as SYSTEM. This may be useful to suppress warnings in projects including this one.
 # GODOT_CPP_WARNING_AS_ERROR	Treat any warnings as errors
+# GODOT_ENABLE_HOT_RELOAD Build with hot reload support. Defaults to YES for Debug-builds and NO for Release-builds.
 # GODOT_CUSTOM_API_FILE:	Path to a custom GDExtension API JSON file (takes precedence over `gdextension_dir`)
 # FLOAT_PRECISION:	Floating-point precision level ("single", "double")
 #
@@ -57,6 +58,13 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "")
 set(CMAKE_BUILD_TYPE Debug)
 endif()
 
+# Hot reload is enabled by default in Debug-builds
+if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+ option(GODOT_ENABLE_HOT_RELOAD "Build with hot reload support" ON)
+else()
+ option(GODOT_ENABLE_HOT_RELOAD "Build with hot reload support" OFF)
+endif()
+
 if(NOT DEFINED BITS)
 set(BITS 32)
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -116,6 +124,10 @@ else()
 endif()
 endif()
 
+if (GODOT_ENABLE_HOT_RELOAD)
+ set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -D HOT_RELOAD_ENABLED")
+endif()
+
 # Generate source from the bindings file
 find_package(Python3 3.4 REQUIRED) # pathlib should be present
 if(GENERATE_TEMPLATE_GET_NODE)