Skip to content

Commit 8f77847

Browse files
committed
Merge branch 'topic/ci-edge' into 'edge'
Use the edge qualifier when building vscode-extension in CI See merge request eng/ide/ada_language_server!1970
2 parents f678eff + fcef739 commit 8f77847

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.gitlab-ci.plan

Lines changed: 1 addition & 1 deletion
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", qualifier={"mono-plat": True})
4+
anod_build("vscode-extension", qualifier={"mono-plat": True} | qualifier)
55

66

77
def test_als_(qualifier={}):

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ include:
6969
cpus: 4
7070
disk: 80
7171
windows: true
72-
rules:
73-
# Does not work on edge
74-
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_TARGET_BRANCH_NAME != 'edge'
75-
allow_failure: true
72+
rules:
73+
# integration-testsuite cannot work with edge builds
74+
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_TARGET_BRANCH_NAME == 'edge'
75+
when: never
7676

7777
# Optional testing of GNAT Studio
7878
- component: $CI_SERVER_FQDN/eng/gitlab-templates/test@~latest

0 commit comments

Comments
 (0)