2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00

Merge branch 'michal/update-gitlab-ci-to-freebsd-12.1' into 'master'

Update GitLab CI to FreeBSD 12.1

See merge request isc-projects/bind9!3180
This commit is contained in:
Michał Kępień
2020-03-16 10:33:31 +00:00
3 changed files with 23 additions and 11 deletions

View File

@@ -47,7 +47,7 @@ stages:
.freebsd-amd64: &freebsd_amd64 .freebsd-amd64: &freebsd_amd64
tags: tags:
- freebsd - libvirt
- amd64 - amd64
.linux-amd64: &linux_amd64 .linux-amd64: &linux_amd64
@@ -1082,12 +1082,16 @@ unit:pkcs11:sid:amd64:
clang:freebsd11.3:amd64: clang:freebsd11.3:amd64:
variables: variables:
CFLAGS: "${CFLAGS_COMMON}" CFLAGS: "${CFLAGS_COMMON}"
USER: gitlab-runner
<<: *freebsd_amd64 <<: *freebsd_amd64
<<: *build_job <<: *build_job
system:clang:freebsd11.3:amd64: system:clang:freebsd11.3:amd64:
<<: *freebsd_amd64 <<: *freebsd_amd64
<<: *system_test_job <<: *system_test_job
variables:
USER: gitlab-runner
TEST_PARALLEL_JOBS: 4
dependencies: dependencies:
- clang:freebsd11.3:amd64 - clang:freebsd11.3:amd64
needs: ["clang:freebsd11.3:amd64"] needs: ["clang:freebsd11.3:amd64"]
@@ -1095,32 +1099,40 @@ system:clang:freebsd11.3:amd64:
unit:clang:freebsd11.3:amd64: unit:clang:freebsd11.3:amd64:
<<: *freebsd_amd64 <<: *freebsd_amd64
<<: *unit_test_job <<: *unit_test_job
variables:
USER: gitlab-runner
dependencies: dependencies:
- clang:freebsd11.3:amd64 - clang:freebsd11.3:amd64
needs: ["clang:freebsd11.3:amd64"] needs: ["clang:freebsd11.3:amd64"]
# Jobs for Clang builds on FreeBSD 12.0 (amd64) # Jobs for Clang builds on FreeBSD 12.1 (amd64)
clang:freebsd12.0:amd64: clang:freebsd12.1:amd64:
variables: variables:
CFLAGS: "${CFLAGS_COMMON}" CFLAGS: "${CFLAGS_COMMON}"
EXTRA_CONFIGURE: "--enable-dnstap" EXTRA_CONFIGURE: "--enable-dnstap"
USER: gitlab-runner
<<: *freebsd_amd64 <<: *freebsd_amd64
<<: *build_job <<: *build_job
system:clang:freebsd12.0:amd64: system:clang:freebsd12.1:amd64:
<<: *freebsd_amd64 <<: *freebsd_amd64
<<: *system_test_job <<: *system_test_job
variables:
USER: gitlab-runner
TEST_PARALLEL_JOBS: 4
dependencies: dependencies:
- clang:freebsd12.0:amd64 - clang:freebsd12.1:amd64
needs: ["clang:freebsd12.0:amd64"] needs: ["clang:freebsd12.1:amd64"]
unit:clang:freebsd12.0:amd64: unit:clang:freebsd12.1:amd64:
<<: *freebsd_amd64 <<: *freebsd_amd64
<<: *unit_test_job <<: *unit_test_job
variables:
USER: gitlab-runner
dependencies: dependencies:
- clang:freebsd12.0:amd64 - clang:freebsd12.1:amd64
needs: ["clang:freebsd12.0:amd64"] needs: ["clang:freebsd12.1:amd64"]
# Jobs for Clang builds on OpenBSD 6.6 (amd64) # Jobs for Clang builds on OpenBSD 6.6 (amd64)

View File

@@ -41,7 +41,7 @@ following systems:
* Ubuntu LTS 16.04, 18.04 * Ubuntu LTS 16.04, 18.04
* Fedora 31 * Fedora 31
* Red Hat Enterprise Linux / CentOS 7, 8 * Red Hat Enterprise Linux / CentOS 7, 8
* FreeBSD 11.3, 12.0 * FreeBSD 11.3, 12.1
* OpenBSD 6.6 * OpenBSD 6.6
* Alpine Linux * Alpine Linux

View File

@@ -49,7 +49,7 @@ following systems:
* Ubuntu LTS 16.04, 18.04 * Ubuntu LTS 16.04, 18.04
* Fedora 31 * Fedora 31
* Red Hat Enterprise Linux / CentOS 7, 8 * Red Hat Enterprise Linux / CentOS 7, 8
* FreeBSD 11.3, 12.0 * FreeBSD 11.3, 12.1
* OpenBSD 6.6 * OpenBSD 6.6
* Alpine Linux * Alpine Linux