Merge pull request #449 from godot-rust/bugfix/macos-ci

CI: update LLVM from 10.0 to 15.0.7 -> fix spurious macOS failures

Author: Bromeon

.github/composite/llvm/action.yml

@@ -5,11 +5,11 @@
 name: llvm
 description: "Install LLVM + Clang, with caching"
 
-#inputs:
-#  llvm:
-#    required: false
-#    default: 'true'
-#    description: "Whether LLVM should be installed ('true' by default)"
+inputs:
+  llvm-version:
+    required: false
+    default: '15.0.7'
+    description: "LLVM versions. Greater than 15 may not be supported in all runners."
 
 runs:
   using: "composite"
@@ -31,12 +31,13 @@ runs:
 #          C:/Program Files/LLVM
 #          ./llvm
         path: ${{ env.LLVM_INSTALL_DIR }}
-        key: llvm-10.0
+        key: "llvm-${{ inputs.llvm-version }}"
 
     - uses: KyleMayes/install-llvm-action@v1
       # if: inputs.llvm == 'true'
       with:
-        version: "10.0"
+        # Newer versions failed on macOS with "Unsupported target! (platform='darwin', version='17.0.2')"
+        version: "${{ inputs.llvm-version }}"
         directory: ${{ env.LLVM_INSTALL_DIR }}
         cached: ${{ steps.cache-llvm.outputs.cache-hit }}
 

godot-bindings/src/godot_exe.rs

@@ -100,33 +100,26 @@ fn update_version_file(version: &str) {
 */
 
 pub(crate) fn read_godot_version(godot_bin: &Path) -> GodotVersion {
-    let output = Command::new(godot_bin)
-        .arg("--version")
-        .output()
-        .unwrap_or_else(|_| {
-            panic!(
-                "failed to invoke Godot executable '{}'",
-                godot_bin.display()
-            )
-        });
+    let mut cmd = Command::new(godot_bin);
+    cmd.arg("--version");
 
-    let output = String::from_utf8(output.stdout).expect("convert Godot version to UTF-8");
-    println!("Godot version: {output}");
+    let output = execute(cmd, "read Godot version");
+    let stdout = std::str::from_utf8(&output.stdout).expect("convert Godot version to UTF-8");
 
-    match parse_godot_version(&output) {
+    match parse_godot_version(&stdout) {
         Ok(parsed) => {
             assert_eq!(
                 parsed.major,
                 4,
                 "Only Godot versions >= 4.0 are supported; found version {}.",
-                output.trim()
+                stdout.trim()
             );
 
             parsed
         }
         Err(e) => {
             // Don't treat this as fatal error
-            panic!("failed to parse Godot version '{output}': {e}")
+            panic!("failed to parse Godot version '{stdout}': {e}")
         }
     }
 }
@@ -275,27 +268,25 @@ pub(crate) fn locate_godot_binary() -> PathBuf {
     }
 }
 
-fn execute(mut cmd: Command, error_message: &str) -> Output {
+fn execute(cmd: Command, error_message: &str) -> Output {
+    try_execute(cmd, error_message).unwrap_or_else(|e| panic!("{}", e))
+}
+
+fn try_execute(mut cmd: Command, error_message: &str) -> Result<Output, String> {
     let output = cmd
         .output()
-        .unwrap_or_else(|_| panic!("failed to execute command: {error_message}"));
+        .map_err(|_| format!("failed to invoke command ({error_message})\n\t{cmd:?}"))?;
+
+    println!("[stdout] {}", std::str::from_utf8(&output.stdout).unwrap());
+    println!("[stderr] {}", std::str::from_utf8(&output.stderr).unwrap());
+    println!("[status] {}", output.status);
 
     if output.status.success() {
-        println!(
-            "[stdout] {}",
-            String::from_utf8(output.stdout.clone()).unwrap()
-        );
-        println!(
-            "[stderr] {}",
-            String::from_utf8(output.stderr.clone()).unwrap()
-        );
-        println!("[status] {}", output.status);
-        output
+        Ok(output)
     } else {
-        println!("[stdout] {}", String::from_utf8(output.stdout).unwrap());
-        println!("[stderr] {}", String::from_utf8(output.stderr).unwrap());
-        println!("[status] {}", output.status);
-        panic!("command returned error: {error_message}");
+        Err(format!(
+            "command returned error ({error_message})\n\t{cmd:?}"
+        ))
     }
 }