Skip to content

Commit f649557

Browse files
committed
Merge branch 'pmderodat/ci' into 'master'
Various CI cleanups See merge request eng/cov/gnatcoverage!301 For eng/it/ci-fragments#30
2 parents aca3a44 + 3d6827c commit f649557

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

.gitlab-ci.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
# This bit is used to make sure we don't run too many pipelines:
2-
# don't run the branch CI when a merge request is already open for the
3-
# branch.
41
workflow:
52
rules:
6-
- if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
7-
when: never
8-
- when: always
3+
# Run the CI on merge requests only
4+
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
95

106
variables:
117
PACKAGE_BASE_NAME: gnatcoverage.tar.gz
@@ -43,13 +39,14 @@ stages:
4339
- test
4440

4541
build:
42+
interruptible: true
4643
services:
4744
- image:gnatcov
4845
- cpu:8
4946
- mem:16
5047
stage: build
5148
script:
52-
- (unset GITLAB_TOKEN; require_issue)
49+
- require_issue
5350

5451
- export PATH=/it/e3/bin:$PATH
5552
- *edge_vars
@@ -72,6 +69,7 @@ build:
7269
- $PACKAGE_BASE_NAME
7370

7471
build_community:
72+
interruptible: true
7573
services:
7674
- image:gnatcov
7775
- cpu:8
@@ -140,6 +138,7 @@ build_community:
140138
path: coverage/cobertura.xml
141139

142140
test_bin_traces:
141+
interruptible: true
143142
services:
144143
- image:gnatcov
145144
- cpu:8
@@ -161,6 +160,7 @@ test_bin_traces:
161160
<<: *artifacts
162161

163162
test_src_traces:
163+
interruptible: true
164164
services:
165165
- image:gnatcov
166166
- cpu:8
@@ -182,6 +182,7 @@ test_src_traces:
182182
<<: *artifacts
183183

184184
test_spark:
185+
interruptible: true
185186
services:
186187
- image:gnatcov
187188
- cpu:8

0 commit comments

Comments
 (0)