mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

Do not run Ubuntu 18.04 jobs in MR-triggered pipelines

Browse Source 
With the addition of Ubuntu 22.04 three more CI jobs were added. To
compensate for that, move Ubuntu 18.04 jobs out of MR-triggered
pipelines to schedule-triggered ones.

Also, move --disable-geoip ./configure options from Ubuntu 18.04 to
Ubuntu 20.04 jobs to keep these options in the more frequent
MR-triggered pipelines.
This commit is contained in:
Michal Nowak
2022-06-15 16:06:48 +02:00
parent 4c2af3bdfa
commit 06c591667e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@@ -882,13 +882,15 @@ gcc:bionic:amd64:
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON} -O2" CFLAGS: "${CFLAGS_COMMON} -O2"
EXTRA_CONFIGURE: "--disable-dnstap --disable-geoip" EXTRA_CONFIGURE: "--disable-dnstap"
<<: *ubuntu_bionic_amd64_image <<: *ubuntu_bionic_amd64_image
<<: *build_job <<: *build_job
<<: *schedules_tags_web_triggering_rules
system:gcc:bionic:amd64: system:gcc:bionic:amd64:
<<: *ubuntu_bionic_amd64_image <<: *ubuntu_bionic_amd64_image
<<: *system_test_job <<: *system_test_job
<<: *schedules_tags_web_triggering_rules
needs: needs:
- job: gcc:bionic:amd64 - job: gcc:bionic:amd64
artifacts: true artifacts: true
@@ -896,6 +898,7 @@ system:gcc:bionic:amd64:
unit:gcc:bionic:amd64: unit:gcc:bionic:amd64:
<<: *ubuntu_bionic_amd64_image <<: *ubuntu_bionic_amd64_image
<<: *unit_test_job <<: *unit_test_job
<<: *schedules_tags_web_triggering_rules
needs: needs:
- job: gcc:bionic:amd64 - job: gcc:bionic:amd64
artifacts: true artifacts: true
@@ -906,7 +909,7 @@ gcc:focal:amd64:
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og" CFLAGS: "${CFLAGS_COMMON} -Og"
EXTRA_CONFIGURE: "--with-libidn2" EXTRA_CONFIGURE: "--disable-geoip --with-libidn2"
<<: *ubuntu_focal_amd64_image <<: *ubuntu_focal_amd64_image
<<: *build_job <<: *build_job