Skip to content

Commit 5d45b92

Browse files
mpickeringMarge Bot
authored andcommitted
ci: Test bootstrapping configurations with full-ci and on marge batches
There have been two incidents recently where bootstrapping has been broken by removing support for building with 9.2.*. The process for bumping the minimum required version starts with bumping the configure version and then other CI jobs such as the bootstrap jobs have to be updated. We must not silently bump the minimum required version. Now we are running a slimmed down validate pipeline it seems worthwile to test these bootstrap configurations in the full-ci pipeline.
1 parent af6fdf4 commit 5d45b92

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

.gitlab-ci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,8 @@ source-tarball:
604604
- if: $NIGHTLY
605605
- if: '$RELEASE_JOB == "yes"'
606606
- if: '$CI_MERGE_REQUEST_LABELS =~ /.*test-bootstrap.*/'
607+
- if: '$CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/'
608+
- if: '$CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/'
607609

608610
generate-hadrian-bootstrap-sources:
609611
stage: full-build
@@ -622,6 +624,8 @@ generate-hadrian-bootstrap-sources:
622624
- if: $NIGHTLY
623625
- if: '$RELEASE_JOB == "yes"'
624626
- if: '$CI_MERGE_REQUEST_LABELS =~ /.*test-bootstrap.*/'
627+
- if: '$CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/'
628+
- if: '$CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/'
625629

626630

627631
package-hadrian-bootstrap-sources:
@@ -639,6 +643,8 @@ package-hadrian-bootstrap-sources:
639643
- if: $NIGHTLY
640644
- if: '$RELEASE_JOB == "yes"'
641645
- if: '$CI_MERGE_REQUEST_LABELS =~ /.*test-bootstrap.*/'
646+
- if: '$CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/'
647+
- if: '$CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/'
642648

643649
test-bootstrap:
644650
stage: full-build
@@ -675,6 +681,8 @@ test-bootstrap:
675681
rules:
676682
- if: $NIGHTLY
677683
- if: '$CI_MERGE_REQUEST_LABELS =~ /.*test-bootstrap.*/'
684+
- if: '$CI_MERGE_REQUEST_LABELS =~ /.*full-ci.*/'
685+
- if: '$CI_MERGE_REQUEST_LABELS =~ /.*marge_bot_batch_merge_job.*/'
678686
- if: '$RELEASE_JOB == "yes"'
679687
when: always
680688
variables:

0 commit comments

Comments
 (0)