Skip to content

Commit e3affaf

Browse files
authored
Merge pull request #2 from hikogui/fix-set-output-deprecation
Fix set-output deprecation
2 parents 6d4b380 + 110af35 commit e3affaf

File tree

2 files changed

+13
-21
lines changed

2 files changed

+13
-21
lines changed

install-sdk/action.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#
2-
# .github/workflows/build-on-windows.yml
2+
# install-sdk/action.yml
33
#
44
# Copyright 2021 Jens A. Koch.
55
# SPDX-License-Identifier: BSL-1.0
6-
# This file is part of ttauri-project.
6+
# This file is part of hikogui.
77
#
88

99
name: "Install Vulkan SDK"
@@ -19,36 +19,30 @@ inputs:
1919
runs:
2020
using: "composite"
2121
steps:
22-
- name: 📥 Setup download urls VULKAN_SDK_URL & VULKAN_RUN_URL
23-
id: vulkan-environment
24-
shell: pwsh
25-
run: |
26-
$env:BASE_URL="https://sdk.lunarg.com/sdk/download/${env:VULKAN_VERSION}/windows"
27-
$env:VULKAN_SDK_URL="${env:BASE_URL}/VulkanSDK-${env:VULKAN_VERSION}-Installer.exe?Human=true"
28-
$env:VULKAN_RUN_URL="${env:BASE_URL}/vulkan-runtime-components.zip?Human=true"
29-
echo "VULKAN_SDK_URL=${env:VULKAN_SDK_URL}" >> $env:GITHUB_ENV
30-
echo "VULKAN_RUN_URL=${env:VULKAN_RUN_URL}" >> $env:GITHUB_ENV
31-
3222
- name: Download Vulkan SDK
23+
env:
24+
VULKAN_SDK_URL: https://sdk.lunarg.com/sdk/download/${{inputs.VULKAN_VERSION}}/windows/VulkanSDK-${{inputs.VULKAN_VERSION}}-Installer.exe?Human=true
3325
shell: pwsh
34-
run: curl -L --silent --show-error --output VulkanSDK.exe ${env:VULKAN_SDK_URL}
26+
run: curl -L --silent --show-error --output VulkanSDK.exe "${{env.VULKAN_SDK_URL}}"
3527

3628
- name: Install Vulkan SDK
3729
shell: cmd
38-
run: VulkanSDK.exe in com.lunarg.vulkan.core com.lunarg.vulkan.vma --accept-licenses --default-answer --confirm-command --root %VULKAN_SDK%
30+
run: VulkanSDK.exe in com.lunarg.vulkan.core com.lunarg.vulkan.vma --accept-licenses --default-answer --confirm-command --root ${{inputs.VULKAN_SDK}}
3931

4032
- name: Download Vulkan runtime
33+
env:
34+
VULKAN_RUN_URL: https://sdk.lunarg.com/sdk/download/${{inputs.VULKAN_VERSION}}/windows/vulkan-runtime-components.zip?Human=true
4135
shell: pwsh
42-
run: curl -L --silent --show-error --output vulkan-runtime.zip "${env:VULKAN_RUN_URL}"
36+
run: curl -L --silent --show-error --output vulkan-runtime.zip "${{env.VULKAN_RUN_URL}}"
4337

4438
- name: Install Vulkan Runtime (vulkan-1.dll)
4539
shell: pwsh
46-
run: 7z e vulkan-runtime.zip -o"${env:VULKAN_SDK}\runtime\x64" */x64
40+
run: 7z e vulkan-runtime.zip -o"${{inputs.VULKAN_SDK}}\runtime\x64" */x64
4741

4842
- name: Reduce VULKAN_SDK size before caching
4943
shell: pwsh
44+
working-directory: ${{inputs.VULKAN_SDK}}
5045
run: |
51-
cd "${env:VULKAN_SDK}"
5246
"Folder size before: {0:N2} MB" -f ((ls . -r | Measure-Object -Property Length -Sum).Sum / 1MB)
5347
Remove-Item -Recurse -Force "Demos"
5448
Remove-Item -Recurse -Force "Helpers"

sdk-version/action.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ runs:
3030
id: vulkan-environment
3131
shell: pwsh
3232
run: |
33-
$env:VULKAN_SDK="C:\VulkanSDK\${env:VULKAN_VERSION}"
34-
echo "VULKAN_SDK=${env:VULKAN_SDK}" >> $env:GITHUB_ENV
35-
echo "::set-output name=VULKAN_VERSION::${env:VULKAN_VERSION}"
36-
echo "::set-output name=VULKAN_SDK::${env:VULKAN_SDK}"
33+
echo "VULKAN_VERSION=${{env.VULKAN_VERSION}}" >> $env:GITHUB_OUTPUT
34+
echo "VULKAN_SDK=C:\VulkanSDK\${{env.VULKAN_VERSION}}" >> $env:GITHUB_OUTPUT
3735

0 commit comments

Comments
 (0)