Tweaks for CI

This commit is contained in:
Wojciech Figat
2022-01-17 12:57:00 +01:00
parent b6f7b25407
commit 8757430dc3
2 changed files with 9 additions and 8 deletions

View File

@@ -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: |

View File

@@ -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