diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 321b2b3d3..3478d18ed 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -8,12 +8,6 @@ jobs: name: Editor (Linux, Development x64) runs-on: "ubuntu-20.04" steps: - - name: Checkout repo - uses: actions/checkout@v2 - - name: Checkout LFS - run: | - git lfs version - git lfs pull - name: Install dependencies run: | sudo rm -f /etc/apt/sources.list.d/* @@ -24,9 +18,16 @@ jobs: run: | wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-focal.list http://packages.lunarg.com/vulkan/lunarg-vulkan-focal.list - sudo apt-get install vulkan-sdk + sudo apt update + sudo apt install vulkan-sdk apt list vulkan-sdk echo Vulkan SDK installed! + - name: Checkout repo + uses: actions/checkout@v2 + - name: Checkout LFS + run: | + git lfs version + git lfs pull - name: Build run: | ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxEditor @@ -43,7 +44,8 @@ jobs: run: | wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-focal.list http://packages.lunarg.com/vulkan/lunarg-vulkan-focal.list - sudo apt-get install vulkan-sdk + sudo apt update + sudo apt install vulkan-sdk apt list vulkan-sdk echo Vulkan SDK installed! - name: Checkout repo diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml index e405e6dbb..af42c14e1 100644 --- a/.github/workflows/build_mac.yml +++ b/.github/workflows/build_mac.yml @@ -11,19 +11,18 @@ jobs: name: Editor (Mac, Development x64) runs-on: "macos-latest" steps: + - name: Setup Vulkan + 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 + echo Vulkan SDK installed! - name: Checkout repo uses: actions/checkout@v2 - name: Checkout LFS run: | git lfs version git lfs pull - - name: Setup Vulkan - 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 - hdiutil detach "vulkansdk-macos-$VULKAN_SDK_VERSION.dmg" - echo Vulkan SDK installed! - name: Build run: | ./Development/Scripts/Mac/CallBuildTool.sh -build -log -arch=x64 -platform=Mac -configuration=Development -buildtargets=FlaxEditor @@ -33,19 +32,18 @@ jobs: name: Game (Mac, Release x64) runs-on: "macos-latest" steps: + - name: Setup Vulkan + 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 + echo Vulkan SDK installed! - name: Checkout repo uses: actions/checkout@v2 - name: Checkout LFS run: | git lfs version git lfs pull - - name: Setup Vulkan - 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 - hdiutil detach "vulkansdk-macos-$VULKAN_SDK_VERSION.dmg" - echo Vulkan SDK installed! - name: Build run: | ./Development/Scripts/Mac/CallBuildTool.sh -build -log -arch=x64 -platform=Mac -configuration=Release -buildtargets=FlaxGame diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index d6db21f50..ed029846f 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -11,21 +11,21 @@ jobs: name: Editor (Windows, Development x64) runs-on: "windows-latest" steps: + - name: Setup Vulkan + run: | + $ver = (Invoke-WebRequest -Uri "https://vulkan.lunarg.com/sdk/latest.json" | ConvertFrom-Json).windows + echo "Vulkan SDK version $ver" + $ProgressPreference = 'SilentlyContinue' + Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/$ver/windows/VulkanSDK-$ver-Installer.exe" -OutFile VulkanSDK.exe + echo "Vulkan SDK downloaded" + .\VulkanSDK.exe --root C:\VulkanSDK --accept-licenses --default-answer --confirm-command install + echo "Vulkan SDK installed!" - name: Checkout repo uses: actions/checkout@v2 - name: Checkout LFS run: | git lfs version git lfs pull - - name: Setup Vulkan - run: | - $ver = (Invoke-WebRequest -Uri "https://vulkan.lunarg.com/sdk/latest.json" | ConvertFrom-Json).windows - echo Vulkan SDK version $ver - $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/$ver/windows/VulkanSDK-$ver-Installer.exe" -OutFile VulkanSDK.exe - echo Vulkan SDK downloaded - .\VulkanSDK.exe --root C:\VulkanSDK --accept-licenses --default-answer --confirm-command install - echo Vulkan SDK installed! - name: Build run: | .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor @@ -35,21 +35,21 @@ jobs: name: Game (Windows, Release x64) runs-on: "windows-latest" steps: + - name: Setup Vulkan + run: | + $ver = (Invoke-WebRequest -Uri "https://vulkan.lunarg.com/sdk/latest.json" | ConvertFrom-Json).windows + echo "Vulkan SDK version $ver" + $ProgressPreference = 'SilentlyContinue' + Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/$ver/windows/VulkanSDK-$ver-Installer.exe" -OutFile VulkanSDK.exe + echo "Vulkan SDK downloaded" + .\VulkanSDK.exe --root C:\VulkanSDK --accept-licenses --default-answer --confirm-command install + echo "Vulkan SDK installed!" - name: Checkout repo uses: actions/checkout@v2 - name: Checkout LFS run: | git lfs version git lfs pull - - name: Setup Vulkan - run: | - $ver = (Invoke-WebRequest -Uri "https://vulkan.lunarg.com/sdk/latest.json" | ConvertFrom-Json).windows - echo Vulkan SDK version $ver - $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/$ver/windows/VulkanSDK-$ver-Installer.exe" -OutFile VulkanSDK.exe - echo Vulkan SDK downloaded - .\VulkanSDK.exe --root C:\VulkanSDK --accept-licenses --default-answer --confirm-command install - echo Vulkan SDK installed! - name: Build run: | .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=x64 -platform=Windows -configuration=Release -buildtargets=FlaxGame