Skip to content

Commit 9e290d5

Browse files
authored
Update action.yml
1 parent a7e159e commit 9e290d5

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

action.yml

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ inputs:
1414
required: true
1515

1616
outputs:
17+
VULKAN_VERSION:
18+
description: "Version number of the vulkan sdk"
19+
value: ${{ steps.vulkan-environment.outputs.VULKAN_VERSION }}
20+
1721
VULKAN_SDK:
1822
description: "Location of the vulkan sdk"
19-
value: ${{ steps.vulkan-output.outputs.VULKAN_SDK }}
23+
value: ${{ steps.vulkan-environment.outputs.VULKAN_SDK }}
2024

2125
runs:
2226
using: "composite"
@@ -25,45 +29,47 @@ runs:
2529
shell: pwsh
2630
run: |
2731
echo 'VULKAN_VERSION<<EOF' >> $env:GITHUB_ENV
28-
curl https://vulkan.lunarg.com/sdk/latest/windows.txt >> $env:GITHUB_ENV
32+
curl --silent https://vulkan.lunarg.com/sdk/latest/windows.txt >> $env:GITHUB_ENV
2933
echo 'EOF' >> $env:GITHUB_ENV
3034
31-
- name: 📥 Set VULKAN_SDK as environment variable
32-
shell: pwsh
33-
run: |
34-
echo VULKAN_SDK=C:\VulkanSDK\${{ env.VULKAN_VERSION }} >> $env:GITHUB_ENV
35-
3635
- name: 📥 Setup download urls VULKAN_SDK_URL & VULKAN_RUN_URL
36+
id: vulkan-environment
3737
shell: pwsh
3838
run: |
39-
$env:BASE_URL="https://sdk.lunarg.com/sdk/download/${{ env.VULKAN_VERSION }}/windows"
40-
echo VULKAN_SDK_URL=$env:BASE_URL/VulkanSDK-${{ env.VULKAN_VERSION }}-Installer.exe?Human=true >> $env:GITHUB_ENV
41-
echo VULKAN_RUN_URL=$env:BASE_URL/vulkan-runtime-components.zip?Human=true >> $env:GITHUB_ENV
39+
$env:BASE_URL="https://sdk.lunarg.com/sdk/download/${env:VULKAN_VERSION}/windows"
40+
$env:VULKAN_SDK_URL="${env:BASE_URL}/VulkanSDK-${env:VULKAN_VERSION}-Installer.exe?Human=true"
41+
$env:VULKAN_RUN_URL="${env:BASE_URL}/vulkan-runtime-components.zip?Human=true"
42+
$env:VULKAN_SDK="C:\VulkanSDK\{$env:VULKAN_VERSION}"
43+
echo "VULKAN_SDK=${env:VULKAN_SDK}" >> $env:GITHUB_ENV
44+
echo "VULKAN_SDK_URL=${env:VULKAN_SDK_URL}" >> $env:GITHUB_ENV
45+
echo "VULKAN_RUN_URL=${env:VULKAN_RUN_URL}" >> $env:GITHUB_ENV
46+
echo "::set-output name=VULKAN_VERSION::${env:VULKAN_VERSION}"
47+
echo "::set-output name=VULKAN_SDK::${env:VULKAN_SDK}"
4248
4349
- name: 🔽 Install VULKAN_SDK
4450
shell: pwsh
4551
run: |
46-
if ( $env:INPUT_INSTALL -eq "true")
52+
if ( "${env:INPUT_INSTALL}" -eq "true")
4753
{
48-
curl -L --silent --show-error --output VulkanSDK.exe %VULKAN_SDK_URL%
54+
curl -L --silent --show-error --output VulkanSDK.exe "${env:VULKAN_SDK_URL}"
4955
VulkanSDK.exe /S
5056
}
5157
5258
- name: 🔽 Install VULKAN Runtime (➔ vulkan-1.dll)
5359
shell: pwsh
5460
run: |
55-
if ( $env:INPUT_INSTALL -eq "true")
61+
if ( "${env:INPUT_INSTALL}" -eq "true")
5662
{
57-
curl -L --silent --show-error --output vulkan-runtime.zip %VULKAN_RUN_URL%
58-
7z e vulkan-runtime.zip -o%VULKAN_SDK%\runtime\x64 */x64
63+
curl -L --silent --show-error --output vulkan-runtime.zip "${env:VULKAN_RUN_URL}"
64+
7z e vulkan-runtime.zip -o${env:VULKAN_SDK}\runtime\x64 */x64
5965
}
6066
6167
- name: ✂ Reduce VULKAN_SDK size before caching
6268
shell: pwsh
6369
run: |
64-
if ( $env:INPUT_INSTALL -eq "true")
70+
if ( "${env:INPUT_INSTALL}" -eq "true")
6571
{
66-
cd ${{ env.VULKAN_SDK }}
72+
cd "${env:VULKAN_SDK}"
6773
"Folder size before: {0:N2} MB" -f ((ls . -r | Measure-Object -Property Length -Sum).Sum / 1MB)
6874
Remove-Item -Recurse -Force "Bin32"
6975
Remove-Item -Recurse -Force "Demos"
@@ -74,10 +80,3 @@ runs:
7480
Remove-Item -Recurse -Force "Tools32"
7581
"Folder size after: {0:N2} MB" -f ((ls . -r | Measure-Object -Property Length -Sum).Sum / 1MB)
7682
}
77-
78-
- name: 📤 Set outputs
79-
shell: pwsh
80-
run: |
81-
echo "::set-output name=VULKAN_SDK::${{ env.VULKAN_SDK }}"
82-
83-

0 commit comments

Comments
 (0)