Skip to content

Commit 2e0711b

Browse files
committed
revert test setting VSCMD_ARG_TGT_ARCH enc in presets
1 parent 3e6988d commit 2e0711b

2 files changed

Lines changed: 14 additions & 5 deletions

File tree

.github/workflows/node-ci.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,21 @@ jobs:
146146
working-directory: platform/node
147147
run: npm ci --ignore-scripts
148148

149-
- name: Set up msvc dev cmd (Windows)
150-
if: runner.os == 'Windows'
149+
- name: Set up msvc dev cmd (Windows x64)
150+
if: runner.os == 'Windows' && matrix.arch == 'x86_64'
151+
uses: ilammy/msvc-dev-cmd@v1
152+
153+
- name: Set up msvc dev cmd (Windows ARM64)
154+
if: runner.os == 'Windows' && matrix.arch == 'arm64'
151155
uses: ilammy/msvc-dev-cmd@v1
156+
with:
157+
arch: amd64_arm64
158+
159+
- name: Test VSCMD_ARG_TGT_ARCH Environment
160+
if: runner.os == 'Windows'
161+
run: |
162+
echo "VSCMD_ARG_TGT_ARCH=%VSCMD_ARG_TGT_ARCH%"
163+
shell: cmd
152164

153165
- name: cmake version
154166
run: |

CMakePresets.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,6 @@
217217
"value": "ARM64",
218218
"strategy": "set"
219219
},
220-
"environment": {
221-
"VSCMD_ARG_TGT_ARCH": "arm64"
222-
},
223220
"cacheVariables": {
224221
"CMAKE_SYSTEM_NAME": "Windows",
225222
"MLN_WITH_OPENGL": "OFF",

0 commit comments

Comments
 (0)