CI: test hot-reload with both stable/api-custom API

Author: Bromeon

.github/workflows/full-ci.yml

@@ -246,7 +246,7 @@ jobs:
             os: macos-13
             artifact-name: macos-x86-nightly
             godot-binary: godot.macos.editor.dev.x86_64
-            with-hot-reload: true
+            hot-reload: stable
 
           - name: macos-double-x86
             os: macos-13
@@ -264,7 +264,7 @@ jobs:
             os: macos-latest
             artifact-name: macos-arm-nightly
             godot-binary: godot.macos.editor.dev.arm64
-            with-hot-reload: true
+            hot-reload: stable
 
            # api-custom on macOS arm64 not working, due to clang linker issues.
 #          - name: macos-double-arm
@@ -285,7 +285,7 @@ jobs:
             os: windows-latest
             artifact-name: windows-nightly
             godot-binary: godot.windows.editor.dev.x86_64.exe
-            with-hot-reload: true
+            hot-reload: stable
 
           - name: windows-double
             os: windows-latest
@@ -317,7 +317,7 @@ jobs:
             artifact-name: linux-nightly
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             rust-extra-args: --features itest/codegen-full
-            with-hot-reload: true
+            hot-reload: api-custom
 
           # Combines now a lot of features, but should be OK. lazy-function-tables doesn't work with experimental-threads.
           - name: linux-double-lazy
@@ -352,12 +352,14 @@ jobs:
             rust-cache-key: release
 
           # Linux compat (4.1 disabled, already covered by memcheck)
+          # No hot-reload before 4.4, as the Godot project is 4.4+.
 
           - name: linux-4.4
             os: ubuntu-22.04
             artifact-name: linux-4.4
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             godot-prebuilt-patch: '4.4'
+            hot-reload: stable
 
           - name: linux-4.3
             os: ubuntu-22.04
@@ -418,10 +420,11 @@ jobs:
           godot-indirect-json: ${{ matrix.godot-indirect-json }}
 
       - name: "Build and test hot-reload"
-        if: ${{ matrix.with-hot-reload }}
+        if: ${{ matrix.hot-reload }}
         working-directory: itest/hot-reload/godot
         # Repeat a few times, our hot reload integration test can sometimes be a bit flaky.
-        run: $RETRY ./run-test.sh
+        # Don't pass in rust-extra-args as environment; they're intended for itest.
+        run: $RETRY ./run-test.sh ${{ matrix.hot-reload }}
         shell: bash
 
 

.github/workflows/minimal-ci.yml

@@ -159,7 +159,7 @@ jobs:
             artifact-name: linux-nightly
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             rust-extra-args: --features itest/codegen-full
-            with-hot-reload: true
+            hot-reload: stable
 
           - name: linux-custom-api-json
             os: ubuntu-22.04
@@ -173,6 +173,7 @@ jobs:
             artifact-name: linux-nightly
             godot-binary: godot.linuxbsd.editor.dev.x86_64
             rust-extra-args: --features itest/experimental-threads,itest/codegen-full-experimental,godot/api-custom,godot/serde,itest/register-docs
+            hot-reload: api-custom
 
           - name: linux-release
             os: ubuntu-22.04
@@ -240,9 +241,9 @@ jobs:
           godot-indirect-json: ${{ matrix.godot-indirect-json }}
 
       - name: "Build and test hot-reload"
-        if: ${{ matrix.with-hot-reload }}
+        if: ${{ matrix.hot-reload }}
         working-directory: itest/hot-reload/godot
-        run: ./run-test.sh
+        run: ./run-test.sh ${{ matrix.hot-reload }}
         shell: bash
 
 

itest/hot-reload/godot/run-test.sh

@@ -6,6 +6,16 @@
 
 rel="."
 
+# If argument is 'api-custom', set 'cargoArgs' to use that feature. If 'stable', set 'cargoArgs' to empty string. Otherwise, error.
+if [[ $1 == "api-custom" ]]; then
+  cargoArgs="--features godot/api-custom"
+elif [[ $1 == "stable" ]]; then
+  cargoArgs=""
+else
+  echo "[Bash]      Error: Unknown argument '$1'. Expected 'api-custom' or 'stable'."
+  exit 1
+fi
+
 # Restore un-reloaded files on exit (for local testing).
 cleanedUp=0 # avoid recursion if cleanup fails
 godotPid=0 # kill previous instance if necessary
@@ -36,7 +46,6 @@ cp editor_layout.cfg $rel/.godot/editor/editor_layout.cfg
 #cp MainScene.tscn $rel/MainScene.tscn
 
 # Compile original Rust source.
-cargoArgs=""
 #cargoArgs="--features godot/__debug-log"
 cargo build -p hot-reload $cargoArgs