test 2

pkdawson · Apr 20, 2024 · 60a881a · 60a881a
1 parent 54e4a4c
commit 60a881a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/gdext.yml b/.github/workflows/gdext.yml
@@ -140,8 +140,8 @@ jobs:
         run: |
           export PATH="$(brew --prefix llvm@15)/bin:$PATH"
           echo $PATH
-          export CC=clang
-          export CXX=clang++
+          export CC=$(which clang)
+          export CXX=$(which clang++)
           env
           clang++ --version
           cd gdext

diff --git a/gdext/SConstruct b/gdext/SConstruct
@@ -5,6 +5,7 @@ import os
 import shutil
 import subprocess
 import SCons
+import sys
 
 
 class CustomCacheDir(SCons.CacheDir.CacheDir):
@@ -42,7 +43,8 @@ elif linux:
 else:
     triplet = "arm64-osx"
     if not os.path.exists("vcpkg_installed"):
-        subprocess.call("zsh scripts/vcpkg-macos.sh", shell=True)
+        if subprocess.call("zsh scripts/vcpkg-macos.sh", shell=True) != 0:
+            sys.exit(1)
 
 if not os.path.exists("gen/imgui_bindings.gen.h"):
     subprocess.call("python scripts/gds_bindings.py", shell=True)

diff --git a/gdext/scripts/vcpkg-macos.sh b/gdext/scripts/vcpkg-macos.sh
@@ -19,6 +19,8 @@ done
 
 rm -r $vcpkg_x64
 
+echo "zzzzzzzzzzzzzzzzzzzzzz"
 cat /Users/runner/work/imgui-godot/imgui-godot/vcpkg/buildtrees/detect_compiler/config-arm64-osx-rel-CMakeCache.txt.log
 cat /Users/runner/work/imgui-godot/imgui-godot/vcpkg/buildtrees/detect_compiler/config-arm64-osx-rel-out.log
 cat /Users/runner/work/imgui-godot/imgui-godot/vcpkg/buildtrees/detect_compiler/config-arm64-osx-rel-err.log
+echo "zzzzzzzzzzzzzzzzzzzzzz"