upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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.

(cherry picked from commit 06c591667e)
This commit is contained in:
Michal Nowak 2022-06-15 16:06:48 +02:00
parent 9b78663110
commit 4265c0e6d6
No known key found for this signature in database
GPG key ID: 24A3E8463AEE5E56
1 changed files with 5 additions and 2 deletions
Show stats 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:
CC: gcc
CFLAGS: "${CFLAGS_COMMON} -O2"
EXTRA_CONFIGURE: "--disable-dnstap --disable-geoip"
EXTRA_CONFIGURE: "--disable-dnstap"
<<: *ubuntu_bionic_amd64_image
<<: *build_job
<<: *schedules_tags_web_triggering_rules
system:gcc:bionic:amd64:
<<: *ubuntu_bionic_amd64_image
<<: *system_test_job
<<: *schedules_tags_web_triggering_rules
needs:
- job: gcc:bionic:amd64
artifacts: true
@ -896,6 +898,7 @@ system:gcc:bionic:amd64:
unit:gcc:bionic:amd64:
<<: *ubuntu_bionic_amd64_image
<<: *unit_test_job
<<: *schedules_tags_web_triggering_rules
needs:
- job: gcc:bionic:amd64
artifacts: true
@ -906,7 +909,7 @@ gcc:focal:amd64:
variables:
CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og"
EXTRA_CONFIGURE: "--with-libidn2"
EXTRA_CONFIGURE: "--disable-geoip --with-libidn2"
<<: *ubuntu_focal_amd64_image
<<: *build_job