Skip to content

Commit 03317e7

Browse files
committed
Add CIs on Windows
1 parent 648e9c9 commit 03317e7

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

.gitlab-ci.plan

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
def build_(qualifier={}):
22
with defaults(qualifier=qualifier):
33
anod_build("als")
4-
anod_build("vscode-extension")
4+
anod_build("vscode-extension", qualifier={"mono-plat": True})
55

66

77
def test_als_(qualifier={}):
@@ -19,10 +19,10 @@ def test_als_cov_(qualifier={}):
1919

2020

2121
def test_vscode_extension_(qualifier={}):
22-
with defaults(qualifier=qualifier):
23-
# Install the component built in the preceding CI build job
24-
anod_install("vscode-extension")
25-
anod_test("vscode-extension", qualifier=qualifier | {"coverage": True})
22+
component_qual = qualifier | {"mono-plat": True}
23+
# Install the component built in the preceding CI build job
24+
anod_install("vscode-extension", qualifier=component_qual)
25+
anod_test("vscode-extension", qualifier=component_qual | {"coverage": True})
2626

2727

2828
def build_test_gs_(qualifier={}):
@@ -64,12 +64,12 @@ def build_test_gs_edge():
6464
def test_integration_testsuite():
6565
# The two components below have been built by the build job of the CI
6666
anod_install("als")
67-
anod_install("vscode-extension")
67+
anod_install("vscode-extension", qualifier={"mono-plat": True})
6868
# Install gps component to avoid it getting rebuilt. We are only interested in
6969
# vscode tests in the integration-testsuite, not gps.
7070
anod_install("gps")
7171
# Run the subset of integration-testsuite that uses VS Code
7272
anod_test(
7373
"integration-testsuite",
74-
qualifier={"run-tools": "vscode", "cleanup-mode": "none"},
74+
qualifier={"run-tools": "vscode", "cleanup-mode": "none", "mono-plat": True},
7575
)

.gitlab-ci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ include:
2121
cpus: 16
2222
disk: 80
2323
image: systemgtk
24+
windows: true
25+
windows-cpus: 8
26+
# 8GB of memory leads to heap exhaustion during compilation. We need more.
27+
windows-mem: 16
2428
save-component: true
2529

2630
# Testing of the ALS
@@ -30,6 +34,7 @@ include:
3034
anod-args: run test_als_$ACI_TRACK
3135
image: systemgtk
3236
disk: 80
37+
windows: true
3338

3439
# Testing of the ALS with coverage
3540
- component: $CI_SERVER_FQDN/eng/gitlab-templates/test@~latest
@@ -50,6 +55,7 @@ include:
5055
job-name: vscode-extension
5156
anod-args: run test_vscode_extension_$ACI_TRACK
5257
image: systemgtk
58+
windows: true
5359

5460
# Integration testsuite
5561
- component: $CI_SERVER_FQDN/eng/gitlab-templates/test@~latest
@@ -62,6 +68,7 @@ include:
6268
image: systemgtk
6369
cpus: 4
6470
disk: 80
71+
windows: true
6572
rules:
6673
# Does not work on edge
6774
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_TARGET_BRANCH_NAME != 'edge'
@@ -75,6 +82,7 @@ include:
7582
image: systemgtk
7683
disk: 80
7784
stage: optional
85+
windows: true
7886
rules:
7987
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
8088
when: manual

0 commit comments

Comments
 (0)