Skip to content

Commit 5b366b6

Browse files
committed
Merge branch 'topic/fix-ci' into 'master'
Fix rule for integration-testsuite CI job See merge request eng/ide/ada_language_server!2021
2 parents 5ed5f74 + acec917 commit 5b366b6

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ include:
7373
# integration-testsuite cannot work with edge builds
7474
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_TARGET_BRANCH_NAME == 'edge'
7575
when: never
76+
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_TARGET_BRANCH_NAME != 'edge'
77+
allow_failure: true
7678

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

0 commit comments

Comments
 (0)