From b3ea3d4482d650328da8062a1d2a18a6f6c01bcb Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Sat, 24 Feb 2024 16:17:31 +1300 Subject: [PATCH] Detect rendering driver to use with macos runner --- .env.example | 3 +++ .github/workflows/main.yml | 11 +++++++++-- Justfile | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index ade8659..e814634 100644 --- a/.env.example +++ b/.env.example @@ -3,3 +3,6 @@ # Name or path to your Godot executable GODOT=godot + +# Rendering driver +RENDERING_DRIVER=vulkan diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 17441e3..1bab54b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -271,9 +271,16 @@ jobs: uses: lihop/setup-godot@v2 with: version: "4.2.1-stable" - - name: Install molten-vk + - name: Macos setup if: ${{ matrix.platform == 'macos' && matrix.test-type == 'rendering' }} - run: brew install molten-vk + run: | + # Some macos runners have metal which means we can use vulkan, others don't. + if system_profiler SPDisplaysDataType | grep -q "Metal"; then + echo RENDERING_DRIVER=vulkan >> .env + brew install molten-vk + else + echo RENDERING_DRIVER=opengl3 >> .env + fi - name: Install just uses: taiki-e/install-action@just - name: Install dependencies diff --git a/Justfile b/Justfile index d168d5c..a431bf0 100644 --- a/Justfile +++ b/Justfile @@ -3,7 +3,7 @@ set dotenv-load -godot := `echo "${GODOT:-godot}"` +godot := `echo "${GODOT:-godot} --rendering-driver ${RENDERING_DRIVER:-vulkan}"` build: cd addons/godot_xterm/native && scons