GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Tweaks for CI

Browse Source
This commit is contained in:
Wojciech Figat
2022-01-17 12:30:03 +01:00
parent 069d51305e
commit 526fa5a33d
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.github/workflows/build_linux.yml vendored
View File

@@ -1,6 +1,9 @@
name: Build Linux name: Build Linux
on: [push, pull_request] on: [push, pull_request]
env:
VULKAN_SDK_VER: 1.2.198.1
jobs: jobs:
# Editor # Editor
@@ -8,6 +11,8 @@ jobs:
name: Editor (Linux, Development x64) name: Editor (Linux, Development x64)
runs-on: "ubuntu-20.04" runs-on: "ubuntu-20.04"
steps: steps:
- name: Checkout repo
uses: actions/checkout@v2
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo rm -f /etc/apt/sources.list.d/* sudo rm -f /etc/apt/sources.list.d/*
@@ -16,14 +21,10 @@ jobs:
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
- name: Setup Vulkan - name: Setup Vulkan
run: | run: |
wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - wget "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/linux/vulkan-sdk.tar.gz" -O vulkan-sdk.tar.gz
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-focal.list http://packages.lunarg.com/vulkan/lunarg-vulkan-focal.list tar -xf vulkan-sdk.tar.gz
sudo apt update export VULKAN_SDK=`pwd`/$VULKAN_SDK_VER/x86_64
sudo apt install vulkan-sdk
apt list vulkan-sdk
echo Vulkan SDK installed! echo Vulkan SDK installed!
- name: Checkout repo
uses: actions/checkout@v2
- name: Checkout LFS - name: Checkout LFS
run: | run: |
git lfs version git lfs version
@@ -37,19 +38,17 @@ jobs:
name: Game (Linux, Release x64) name: Game (Linux, Release x64)
runs-on: "ubuntu-20.04" runs-on: "ubuntu-20.04"
steps: steps:
- name: Checkout repo
uses: actions/checkout@v2
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev
- name: Setup Vulkan - name: Setup Vulkan
run: | run: |
wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - wget "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/linux/vulkan-sdk.tar.gz" -O vulkan-sdk.tar.gz
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-focal.list http://packages.lunarg.com/vulkan/lunarg-vulkan-focal.list tar -xf vulkan-sdk.tar.gz
sudo apt update export VULKAN_SDK=`pwd`/$VULKAN_SDK_VER/x86_64
sudo apt install vulkan-sdk
apt list vulkan-sdk
echo Vulkan SDK installed! echo Vulkan SDK installed!
- name: Checkout repo
uses: actions/checkout@v2
- name: Checkout LFS - name: Checkout LFS
run: | run: |
git lfs version git lfs version

2
.github/workflows/build_mac.yml vendored
View File

@@ -2,7 +2,7 @@ name: Build macOS
on: [push, pull_request] on: [push, pull_request]
env: env:
VULKAN_SDK: $HOME/VulkanSDK VULKAN_SDK: /Users/runner/VulkanSDK
jobs: jobs:

2
Source/Engine/GraphicsDevice/Vulkan/GraphicsDeviceVulkan.Build.cs
View File

@@ -40,7 +40,7 @@ public sealed class VulkanSdk : Sdk
return; return;
var vulkanSdk = Environment.GetEnvironmentVariable("VULKAN_SDK"); var vulkanSdk = Environment.GetEnvironmentVariable("VULKAN_SDK");
if (vulkanSdk == null && platform == TargetPlatform.Mac) if (platform == TargetPlatform.Mac && (vulkanSdk == null || !Directory.Exists(vulkanSdk)))
{ {
// Try to guess install location for the current user // Try to guess install location for the current user
var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "VulkanSDK"); var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "VulkanSDK");