Merge branch 'master' into add-net-pong

Author: ValorZard

.github/other/retry.sh

@@ -15,7 +15,8 @@ for ((attempt=0; attempt<limit; attempt++)); do
     if "$@"; then
         # Command succeeded, exit the loop
         echo "Done."
-        break
+        # Exit with success status code.
+        exit 0
     fi
 
     # Calculate the sleep duration using the retry interval from the array
@@ -26,3 +27,7 @@ for ((attempt=0; attempt<limit; attempt++)); do
     echo "Retry #$attempt in $sleepDuration seconds..."
     sleep "$sleepDuration"
 done
+
+echo "Failed to execute command '$1'."
+# Exit with an error code.
+exit 1

.github/workflows/ci.yml

@@ -34,8 +34,8 @@ env:
   CLIPPY_FEATURES: '--features godot/register-docs,godot/experimental-godot-api,godot/serde'
   TEST_FEATURES: ''
   RETRY: ${{ github.workspace }}/.github/other/retry.sh
-  CARGO_DENY_VERSION: "0.16.1"
-  CARGO_MACHETE_VERSION: "0.7.0"
+  CARGO_DENY_VERSION: "0.18.5"
+  CARGO_MACHETE_VERSION: "0.9.1"
 
 
 defaults:
@@ -151,15 +151,20 @@ jobs:
         include:
           # macOS
 
+          # macOS builds fail semi-randomly with an `libc++abi: Pure virtual function called!` error.
+          # For now on run them with retry; resort to compiling only if it won't be enough (i.e. first time when it will fail three times in the row).
+          # See: https://github.com/godot-rust/demo-projects/issues/12
           - name: macos-x86
             os: macos-13
             artifact-name: macos-x86-nightly
             godot-binary: godot.macos.editor.dev.x86_64
+            retry: true
 
           - name: macos-arm
             os: macos-latest
             artifact-name: macos-arm-nightly
             godot-binary: godot.macos.editor.dev.arm64
+            retry: true
 
           # Windows
 
@@ -175,9 +180,9 @@ jobs:
             artifact-name: linux-nightly
             godot-binary: godot.linuxbsd.editor.dev.x86_64
 
-          - name: linux-4.4
+          - name: linux-4.5
             os: ubuntu-22.04
-            artifact-name: linux-4.4
+            artifact-name: linux-4.5
             godot-binary: godot.linuxbsd.editor.dev.x86_64
 
           # Deliberately don't include:
@@ -214,17 +219,25 @@ jobs:
         run: cargo build --release ${{ matrix.rust-extra-args }}
 
       - name: "Run examples for short time"
+        env:
+          RETRY: ${{ matrix.retry }}
         run: |
           # Enable extended globbing to allow pattern exclusion.
           shopt -s extglob
 
           # Match all directories/files except `target` and any starting with `.`.
           files='!(target|.*)/'
-
+          if [[ $RETRY == "true" ]]; then
+            # macOS – retry running demo projects several times on fail.
+            echo "Running examples with retry"
+            RETRY_CMD="./.github/other/retry.sh"
+          else
+            RETRY_CMD=""
+          fi
           # List all folders in current directory. Don't quote $files variable.
           for demo in $files; do
             # Strip trailing '/' from folder name.
-          	./.github/other/check-example.sh "${demo%/}"
+            $RETRY_CMD ./.github/other/check-example.sh "${demo%/}"
           done
 
 

Cargo.toml

@@ -4,7 +4,7 @@ members = [
     "dodge-the-creeps/rust",
     "hot-reload/rust",
     "net-pong/rust",
-]
+    "squash-the-creeps/rust"
 
 # Note about Jetbrains IDEs: "IDE Sync" (Refresh Cargo projects) may cause static analysis errors such as
 # "at most one `api-*` feature can be enabled". This is because by default, all Cargo features are enabled,

dodge-the-creeps/godot/project.godot

@@ -18,7 +18,7 @@ This is a finished version of the game featured in the 'Your first 2D game'
 tutorial in the documentation. For more details, consider
 following the tutorial in the documentation."
 run/main_scene="res://Main.tscn"
-config/features=PackedStringArray("4.4")
+config/features=PackedStringArray("4.5")
 config/icon="res://icon.png"
 
 [debug]

hot-reload/godot/project.godot

@@ -12,4 +12,4 @@ config_version=5
 
 config/name="hot-reload"
 run/main_scene="uid://da7eiv1notj7j"
-config/features=PackedStringArray("4.4", "Forward Plus")
+config/features=PackedStringArray("4.5", "Forward Plus")

squash-the-creeps/godot/.godot/extension_list.cfg

@@ -0,0 +1 @@
+res://rust.gdextension