More smoke tests

Author: MrAwesome

config-smoke.json

@@ -3,7 +3,7 @@
         "controller_layout_id": "test-layout",
         "add_to_steam_on_install_where_applicable": false
     },
-    "known_categories": ["smoke"],
+    "known_categories": ["smoke", "smoke2"],
     "tricks": [
         {
             "id": "AAA-fail",
@@ -43,9 +43,23 @@
                     "echo 'ZZZ-fail ran, alright' && false"
                 ]
             },
-            "categories": ["smoke"],
+            "categories": ["smoke", "smoke2"],
             "display_name": "ZZZ Fail",
             "description": "Always fails, for testing"
+        },
+        {
+            "id": "CCC-pass",
+            "provider_config": {
+                "type": "simple-command",
+                "command": "/bin/bash",
+                "args": [
+                    "-c",
+                    "echo 'CCC-pass ran, alright'"
+                ]
+            },
+            "categories": ["smoke"],
+            "display_name": "CCC Pass",
+            "description": "Always passes, for testing"
         }
     ]
 }

gui/godot/assets/ibm_plex_mono/IBMPlexMono-SemiBoldItalic.ttf.import

@@ -2,7 +2,7 @@
 
 importer="font_data_dynamic"
 type="FontFile"
-uid="uid://dr7tf2g6xpp4s"
+uid="uid://bma5p7la7tlke"
 path="res://.godot/imported/IBMPlexMono-SemiBoldItalic.ttf-2a22c508bad20ef6a18038769b74e528.fontdata"
 
 [deps]

gui/rust/src/bin/gui_tool.rs

@@ -113,13 +113,41 @@ fn copy_cdylib_into_godot_build(is_debug_build: bool) {
 
 fn godot_import() {
     let godot_bin = resolve_godot_bin();
-    let mut cmd = Command::new(&godot_bin);
-    cmd.current_dir(GODOT_BASE_DIR)
-        .args(["--import"]) // ensure import database updated
-        .args(["--headless"]) // run without GUI for CI
-        .stdout(Stdio::inherit())
-        .stderr(Stdio::inherit());
-    run_cmd(cmd, &format!("{} --import --headless", godot_bin));
+    let human = format!("{} --import --headless", godot_bin);
+    for attempt in 1..=2 {
+        let mut cmd = Command::new(&godot_bin);
+        cmd.current_dir(GODOT_BASE_DIR)
+            .args(["--import"]) // ensure import database updated
+            .args(["--headless"]) // run without GUI for CI
+            .stdout(Stdio::inherit())
+            .stderr(Stdio::inherit());
+
+        match cmd.status() {
+            Ok(status) if status.success() => {
+                return;
+            }
+            Ok(status) => {
+                eprintln!(
+                    "Import attempt {} failed ({}): exit status {:?}",
+                    attempt, human, status
+                );
+            }
+            Err(e) => {
+                eprintln!(
+                    "Failed to run {} (attempt {}): {}",
+                    human, attempt, e
+                );
+            }
+        }
+
+        if attempt == 1 {
+            eprintln!("Retrying Godot import once due to transient failure...");
+            std::thread::sleep(std::time::Duration::from_millis(300));
+            continue;
+        }
+    }
+    eprintln!("Godot import failed after retry.");
+    std::process::exit(1);
 }
 
 fn godot_export(is_debug_build: bool) {