Skip to content

Commit a044e57

Browse files
authored
still run tests on win32-ia32, but make them optional to pass (microsoft#187474)
* still run tests on win32-ia32, but make them optional to pass * hm * ok * try this
1 parent f254ad1 commit a044e57

File tree

4 files changed

+26
-3
lines changed

4 files changed

+26
-3
lines changed

build/azure-pipelines/product-build-pr.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ jobs:
105105
- template: win32/product-build-win32.yml
106106
parameters:
107107
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
108+
VSCODE_ARCH: x64
108109
VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
109110
VSCODE_RUN_UNIT_TESTS: true
110111
VSCODE_RUN_INTEGRATION_TESTS: false
@@ -121,6 +122,7 @@ jobs:
121122
- template: win32/product-build-win32.yml
122123
parameters:
123124
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
125+
VSCODE_ARCH: x64
124126
VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
125127
VSCODE_RUN_UNIT_TESTS: false
126128
VSCODE_RUN_INTEGRATION_TESTS: true
@@ -137,6 +139,7 @@ jobs:
137139
# - template: win32/product-build-win32.yml
138140
# parameters:
139141
# VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
142+
# VSCODE_ARCH: x64
140143
# VSCODE_RUN_UNIT_TESTS: false
141144
# VSCODE_RUN_INTEGRATION_TESTS: false
142145
# VSCODE_RUN_SMOKE_TESTS: true

build/azure-pipelines/product-build.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ stages:
284284
- template: win32/product-build-win32.yml
285285
parameters:
286286
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
287+
VSCODE_ARCH: x64
287288
VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
288289
VSCODE_RUN_UNIT_TESTS: true
289290
VSCODE_RUN_INTEGRATION_TESTS: false
@@ -297,6 +298,7 @@ stages:
297298
- template: win32/product-build-win32.yml
298299
parameters:
299300
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
301+
VSCODE_ARCH: x64
300302
VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
301303
VSCODE_RUN_UNIT_TESTS: false
302304
VSCODE_RUN_INTEGRATION_TESTS: true
@@ -310,6 +312,7 @@ stages:
310312
- template: win32/product-build-win32.yml
311313
parameters:
312314
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
315+
VSCODE_ARCH: x64
313316
VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
314317
VSCODE_RUN_UNIT_TESTS: false
315318
VSCODE_RUN_INTEGRATION_TESTS: false
@@ -324,6 +327,7 @@ stages:
324327
- template: win32/product-build-win32.yml
325328
parameters:
326329
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
330+
VSCODE_ARCH: x64
327331
VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
328332
VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
329333
VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
@@ -347,10 +351,11 @@ stages:
347351
- template: win32/product-build-win32.yml
348352
parameters:
349353
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
354+
VSCODE_ARCH: ia32
350355
VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
351-
VSCODE_RUN_UNIT_TESTS: false
352-
VSCODE_RUN_INTEGRATION_TESTS: false
353-
VSCODE_RUN_SMOKE_TESTS: false
356+
VSCODE_RUN_UNIT_TESTS: true
357+
VSCODE_RUN_INTEGRATION_TESTS: true
358+
VSCODE_RUN_SMOKE_TESTS: true
354359

355360
- ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
356361
- job: WindowsARM64
@@ -361,6 +366,7 @@ stages:
361366
- template: win32/product-build-win32.yml
362367
parameters:
363368
VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
369+
VSCODE_ARCH: arm64
364370
VSCODE_CIBUILD: ${{ variables.VSCODE_CIBUILD }}
365371
VSCODE_RUN_UNIT_TESTS: false
366372
VSCODE_RUN_INTEGRATION_TESTS: false

build/azure-pipelines/win32/product-build-win32-test.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
parameters:
22
- name: VSCODE_QUALITY
33
type: string
4+
- name: VSCODE_ARCH
5+
type: string
46
- name: VSCODE_RUN_UNIT_TESTS
57
type: boolean
68
- name: VSCODE_RUN_INTEGRATION_TESTS
@@ -32,14 +34,17 @@ steps:
3234
- powershell: .\scripts\test.bat --build --tfs "Unit Tests"
3335
displayName: Run unit tests (Electron)
3436
timeoutInMinutes: 15
37+
continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }}
3538

3639
- powershell: yarn test-node --build
3740
displayName: Run unit tests (node.js)
3841
timeoutInMinutes: 15
42+
continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }}
3943

4044
- powershell: yarn test-browser-no-install --sequential --build --browser chromium --tfs "Browser Unit Tests"
4145
displayName: Run unit tests (Browser, Chromium)
4246
timeoutInMinutes: 20
47+
continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }}
4348

4449
- ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
4550
- powershell: |
@@ -94,6 +99,7 @@ steps:
9499
exec { .\scripts\test-integration.bat --build --tfs "Integration Tests" }
95100
displayName: Run integration tests (Electron)
96101
timeoutInMinutes: 20
102+
continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }}
97103
98104
- powershell: |
99105
. build/azure-pipelines/win32/exec.ps1
@@ -102,6 +108,7 @@ steps:
102108
exec { .\scripts\test-web-integration.bat --browser firefox }
103109
displayName: Run integration tests (Browser, Firefox)
104110
timeoutInMinutes: 20
111+
continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }}
105112
106113
- powershell: |
107114
. build/azure-pipelines/win32/exec.ps1
@@ -114,6 +121,7 @@ steps:
114121
exec { .\scripts\test-remote-integration.bat }
115122
displayName: Run integration tests (Remote)
116123
timeoutInMinutes: 20
124+
continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }}
117125
118126
- ${{ if eq(parameters.VSCODE_RUN_SMOKE_TESTS, true) }}:
119127
- powershell: .\build\azure-pipelines\win32\listprocesses.bat
@@ -136,12 +144,14 @@ steps:
136144
- powershell: yarn smoketest-no-compile --tracing --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
137145
displayName: Run smoke tests (Electron)
138146
timeoutInMinutes: 20
147+
continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }}
139148

140149
- powershell: yarn smoketest-no-compile --web --tracing --headless
141150
env:
142151
VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)-web
143152
displayName: Run smoke tests (Browser, Chromium)
144153
timeoutInMinutes: 20
154+
continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }}
145155

146156
- powershell: yarn gulp compile-extension:vscode-test-resolver
147157
displayName: Compile test resolver extension
@@ -152,6 +162,7 @@ steps:
152162
VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)\vscode-server-win32-$(VSCODE_ARCH)
153163
displayName: Run smoke tests (Remote)
154164
timeoutInMinutes: 20
165+
continueOnError: ${{ eq(parameters.VSCODE_ARCH, 'ia32') }}
155166

156167
- powershell: .\build\azure-pipelines\win32\listprocesses.bat
157168
displayName: Diagnostics after smoke test run

build/azure-pipelines/win32/product-build-win32.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
parameters:
22
- name: VSCODE_QUALITY
33
type: string
4+
- name: VSCODE_ARCH
5+
type: string
46
- name: VSCODE_CIBUILD
57
type: boolean
68
- name: VSCODE_RUN_UNIT_TESTS
@@ -188,6 +190,7 @@ steps:
188190
- template: product-build-win32-test.yml
189191
parameters:
190192
VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
193+
VSCODE_ARCH: ${{ parameters.VSCODE_ARCH }}
191194
VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }}
192195
VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
193196
VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }}

0 commit comments

Comments
 (0)