2020 IsSignedZipBranch : $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
2121
2222 steps :
23+ - script : |
24+ IF [%BUILD_ARCH%]==[x64] (
25+ SET RunCommand=
26+ ) ELSE (
27+ SET RunCommand=node script\vsts\windows-run.js
28+ )
29+ echo RunCommand set to: %RunCommand%
30+ env:
31+ BUILD_ARCH: $(buildArch)
32+ displayName: Set RunCommand based on the arch
33+
2334 - task : UsePythonVersion@0
2435 inputs :
2536 versionSpec : ' 3.8'
5364 OS : windows
5465
5566 - script : |
56- node script\vsts\windows-run.js script\bootstrap.cmd
67+ %RunCommand% script\bootstrap.cmd
5768 env:
5869 BUILD_ARCH: $(buildArch)
5970 CI: true
6374 displayName: Bootstrap build environment
6475 condition: or(ne(variables['MainNodeModulesRestored'], 'true'), ne(variables['ScriptNodeModulesRestored'], 'true'), ne(variables['ApmNodeModulesRestored'], 'true'))
6576
66- - script : node script\vsts\windows-run.js script\lint.cmd
77+ - script : |
78+ %RunCommand% script\lint.cmd
6779 env:
6880 BUILD_ARCH: $(buildArch)
6981 displayName: Run linter
@@ -74,21 +86,21 @@ jobs:
7486 IF [%IS_RELEASE_BRANCH%]==[true] (
7587 ECHO Creating production artifacts for release branch %BUILD_SOURCEBRANCHNAME%
7688 IF [%SHOULD_SIGN%]==[true] (
77- node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts --create-windows-installer
89+ %RunCommand% script\build.cmd --no-bootstrap --code-sign --compress-artifacts --create-windows-installer
7890 ) ELSE (
79- node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts --create-windows-installer
91+ %RunCommand% script\build.cmd --no-bootstrap --compress-artifacts --create-windows-installer
8092 )
8193 ) ELSE (
8294 IF [%IS_SIGNED_ZIP_BRANCH%]==[true] (
8395 ECHO Creating signed CI artifacts for branch %BUILD_SOURCEBRANCHNAME%
8496 IF [%SHOULD_SIGN%]==[true] (
85- node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts
97+ %RunCommand% script\build.cmd --no-bootstrap --code-sign --compress-artifacts
8698 ) ELSE (
87- node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts
99+ %RunCommand% script\build.cmd --no-bootstrap --compress-artifacts
88100 )
89101 ) ELSE (
90102 ECHO Pull request build, no code signing will be performed
91- node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts
103+ %RunCommand% script\build.cmd --no-bootstrap --compress-artifacts
92104 )
93105 )
94106 env:
@@ -102,7 +114,8 @@ jobs:
102114 npm_config_build_from_source: true
103115 displayName: Build Atom
104116
105- - script : node script\vsts\windows-run.js script\test.cmd
117+ - script : |
118+ %RunCommand% script\test.cmd
106119 env:
107120 CI: true
108121 CI_PROVIDER: VSTS
@@ -113,7 +126,7 @@ jobs:
113126 condition: and(succeeded(), ne(variables['Atom.SkipTests'], 'true'))
114127
115128 - script : >
116- node script\vsts\windows-run.js script\postprocess-junit-results.cmd
129+ %RunCommand% script\postprocess-junit-results.cmd
117130 --search-folder %TEST_JUNIT_XML_ROOT% --test-results-files "**/*.xml"
118131 env:
119132 TEST_JUNIT_XML_ROOT: $(Common.TestResultsDirectory)\junit
0 commit comments