From 8757430dc373feca1311d6abdb56e73d9d422cde Mon Sep 17 00:00:00 2001 From: Wojciech Figat Date: Mon, 17 Jan 2022 12:57:00 +0100 Subject: [PATCH] Tweaks for CI --- .github/workflows/build_linux.yml | 12 ++++++------ .github/workflows/build_mac.yml | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 441282764..99b4ab225 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -3,6 +3,8 @@ on: [push, pull_request] env: VULKAN_SDK_VER: 1.2.198.1 + VULKAN_SDK_ROOT: /home/runner/work/VulkanSDK + VULKAN_SDK: /home/runner/work/VulkanSDK/$VULKAN_SDK_VER/x86_64 jobs: @@ -22,9 +24,8 @@ jobs: - name: Setup Vulkan run: | wget "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/linux/vulkan-sdk.tar.gz" --no-verbose -O vulkan-sdk.tar.gz - tar -xf vulkan-sdk.tar.gz - export VULKAN_SDK=`pwd`/$VULKAN_SDK_VER/x86_64 - echo "::set-env name=VULKAN_SDK::$VULKAN_SDK" + mkdir $VULKAN_SDK_ROOT + tar -xf vulkan-sdk.tar.gz -C $VULKAN_SDK_ROOT echo Vulkan SDK installed! - name: Checkout LFS run: | @@ -47,9 +48,8 @@ jobs: - name: Setup Vulkan run: | wget "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/linux/vulkan-sdk.tar.gz" --no-verbose -O vulkan-sdk.tar.gz - tar -xf vulkan-sdk.tar.gz - export VULKAN_SDK=`pwd`/$VULKAN_SDK_VER/x86_64 - echo "::set-env name=VULKAN_SDK::$VULKAN_SDK" + mkdir $VULKAN_SDK_ROOT + tar -xf vulkan-sdk.tar.gz -C $VULKAN_SDK_ROOT echo Vulkan SDK installed! - name: Checkout LFS run: | diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml index 1434efdf2..d17b852f7 100644 --- a/.github/workflows/build_mac.yml +++ b/.github/workflows/build_mac.yml @@ -2,6 +2,7 @@ name: Build macOS on: [push, pull_request] env: + VULKAN_SDK_ROOT: /Users/runner/VulkanSDK VULKAN_SDK: /Users/runner/VulkanSDK/macOS jobs: @@ -15,7 +16,7 @@ jobs: run: | curl -LO "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg" hdiutil attach vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk - sudo "/Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan" --root "$HOME/VulkanSDK" --accept-licenses --default-answer --confirm-command install + sudo "/Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan" --root "$VULKAN_SDK_ROOT" --accept-licenses --default-answer --confirm-command install echo Vulkan SDK installed! - name: Checkout repo uses: actions/checkout@v2 @@ -36,7 +37,7 @@ jobs: run: | curl -LO "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg" hdiutil attach vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk - sudo "/Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan" --root "$HOME/VulkanSDK" --accept-licenses --default-answer --confirm-command install + sudo "/Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan" --root "$VULKAN_SDK_ROOT" --accept-licenses --default-answer --confirm-command install echo Vulkan SDK installed! - name: Checkout repo uses: actions/checkout@v2