@@ -15,8 +15,11 @@ inputs:
15
15
default : false
16
16
required : false
17
17
type : boolean
18
- target-arch :
19
- description : The target architecture, "x86", "amd64" or "arm64". Defaults to the host architecture.
18
+ host-arch :
19
+ description : |
20
+ The compiler's host architecture, "x86", "amd64" or "arm64". Defaults to the build
21
+ architecture. (a.k.a. the current runner's architecture).
22
+ This is the target architecture for the Visual Studio Developer Environment.
20
23
required : false
21
24
type : string
22
25
@@ -35,20 +38,20 @@ runs:
35
38
shell : pwsh
36
39
run : |
37
40
if ($IsWindows) {
38
- $HostOS = "windows"
41
+ $BuildOS = "windows"
39
42
} elseif ($IsMacOS) {
40
- $HostOS = "mac "
43
+ $BuildOS = "macosx "
41
44
} else {
42
45
Write-Output "::error::Unsupported host OS."
43
46
exit 1
44
47
}
45
48
46
49
$Arch = ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture).ToString()
47
50
switch ($Arch) {
48
- "X64" { $HostArch = "amd64" }
49
- "Arm64" { $HostArch = "arm64" }
51
+ "X64" { $BuildArch = "amd64" }
52
+ "Arm64" { $BuildArch = "arm64" }
50
53
default {
51
- Write-Output "::error::Unsupported host architecture: `"$HostArch `""
54
+ Write-Output "::error::Unsupported host architecture: `"$BuildArch `""
52
55
exit 1
53
56
}
54
57
}
@@ -79,32 +82,32 @@ runs:
79
82
}
80
83
81
84
if ("${{ inputs.setup-vs-dev-env }}" -eq "true") {
82
- switch ("${{ inputs.target -arch }}") {
83
- "x86" { $TargetArch = "x86" }
84
- "amd64" { $TargetArch = "amd64" }
85
- "arm64" { $TargetArch = "arm64" }
86
- "" { $TargetArch = $HostArch }
85
+ switch ("${{ inputs.host -arch }}") {
86
+ "x86" { $HostArch = "x86" }
87
+ "amd64" { $HostArch = "amd64" }
88
+ "arm64" { $HostArch = "arm64" }
89
+ "" { $HostArch = $BuildArch }
87
90
default {
88
- Write-Output "::error::Unsupported target architecture: `"${{ inputs.target -arch }}`""
91
+ Write-Output "::error::Unsupported host architecture: `"${{ inputs.host -arch }}`""
89
92
exit 1
90
93
}
91
94
}
92
95
} else {
93
- $TargetArch = $HostArch
96
+ $HostArch = $BuildArch
94
97
}
95
98
96
- Write-Output "ℹ️ Host OS: $HostOS"
99
+ Write-Output "ℹ️ Build OS: $BuildOS"
100
+ Write-Output "ℹ️ Build architecture: $BuildArch"
97
101
Write-Output "ℹ️ Host architecture: $HostArch"
98
- Write-Output "ℹ️ Target architecture: $TargetArch"
99
102
100
103
@"
101
- host-os=$HostOS
104
+ build-os=$BuildOS
105
+ build-arch=$BuildArch
102
106
host-arch=$HostArch
103
- target-arch=$TargetArch
104
107
"@ | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
105
108
106
109
- name : Install Windows SDK version ${{ inputs.windows-sdk-version }}
107
- if : steps.sanitize-input.outputs.host -os == 'windows' && inputs.windows-sdk-version != ''
110
+ if : steps.sanitize-input.outputs.build -os == 'windows' && inputs.windows-sdk-version != ''
108
111
shell : pwsh
109
112
run : |
110
113
$WinSdkVersionString = "${{ inputs.windows-sdk-version }}"
@@ -168,7 +171,7 @@ runs:
168
171
}
169
172
170
173
- name : Install Windows MSVC version ${{ inputs.msvc-version }}
171
- if : steps.sanitize-input.outputs.host -os == 'windows' && inputs.msvc-version != ''
174
+ if : steps.sanitize-input.outputs.build -os == 'windows' && inputs.msvc-version != ''
172
175
id : setup-msvc
173
176
shell : pwsh
174
177
run : |
@@ -232,10 +235,10 @@ runs:
232
235
}
233
236
234
237
- name : Setup Visual Studio Developer Environment
235
- if : steps.sanitize-input.outputs.host -os == 'windows' && inputs.setup-vs-dev-env == 'true'
238
+ if : steps.sanitize-input.outputs.build -os == 'windows' && inputs.setup-vs-dev-env == 'true'
236
239
uses : compnerd/gha-setup-vsdevenv@5eb3eae1490d4f7875d574c4973539f69109700d # main
237
240
with :
238
- host_arch : ${{ steps.sanitize-input.outputs.host -arch }}
239
- arch : ${{ steps.sanitize-input.outputs.target -arch }}
241
+ host_arch : ${{ steps.sanitize-input.outputs.build -arch }}
242
+ arch : ${{ steps.sanitize-input.outputs.host -arch }}
240
243
winsdk : ${{ inputs.windows-sdk-version }}
241
244
toolset_version : ${{ inputs.msvc-version }}
0 commit comments