diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 1cd36c5..c9dba25 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -271,13 +271,30 @@ jobs: echo "$GITHUB_WORKSPACE/toolchain/v" >> "$GITHUB_PATH" - name: Install native build dependencies run: sudo apt-get update && sudo apt-get install -y build-essential cmake libglfw3-dev libvulkan-dev libvulkan-volk-dev pkg-config + - name: Install headers matching Vulkan master + run: | + set -euo pipefail + vulkan_root="$GITHUB_WORKSPACE/source/modules/antono2/vulkan" + registry_commit=$(tr -d '\r\n' < "$vulkan_root/REGISTRY_COMMIT") + headers_checkout="$RUNNER_TEMP/Vulkan-Headers" + git init -q "$headers_checkout" + git -C "$headers_checkout" remote add origin https://github.com/KhronosGroup/Vulkan-Headers.git + git -C "$headers_checkout" fetch --depth 1 origin "$registry_commit" + git -C "$headers_checkout" checkout --detach FETCH_HEAD + test "$(git -C "$headers_checkout" rev-parse HEAD)" = "$registry_commit" + sudo cp -R "$headers_checkout/include/." "$VULKAN_SDK/include/" + volk_commit=$(tr -d '\r\n' < "$vulkan_root/VOLK_COMMIT") + curl --fail --silent --show-error --location \ + "https://raw.githubusercontent.com/zeux/volk/$volk_commit/volk.h" \ + --output "$RUNNER_TEMP/volk.h" + sudo install -m 0644 "$RUNNER_TEMP/volk.h" "$VULKAN_SDK/include/volk.h" - name: Build and test player with V3 run: | cd source/modules/antono2/imgui v run build_vimgui.vsh --linkage shared --glfw system cd "$GITHUB_WORKSPACE/source/v_vulkan_video" - v -cc gcc test . - v -cc gcc -o "$RUNNER_TEMP/v_vulkan_video" . + v -new-compiler -cc gcc test . + v -new-compiler -cc gcc -o "$RUNNER_TEMP/v_vulkan_video" . windows: name: Windows / stable