Adjust the differences between v9_16 and v9_11 GitLab CI job configuration

This commit is contained in:
Ondřej Surý 2020-03-25 18:20:40 +01:00
parent 95d2d8399a
commit f801f0f926

View file

@ -54,6 +54,11 @@ stages:
- linux
- amd64
.linux-arm64: &linux_arm64
tags:
- linux
- arm64
.linux-i386: &linux_i386
tags:
- linux
@ -104,6 +109,10 @@ stages:
image: "$CI_REGISTRY_IMAGE:debian-sid-amd64"
<<: *linux_amd64
.debian-sid-arm64: &debian_sid_arm64_image
image: "$CI_REGISTRY_IMAGE:debian-sid-arm64"
<<: *linux_arm64
.debian-sid-i386: &debian_sid_i386_image
image: "$CI_REGISTRY_IMAGE:debian-sid-i386"
<<: *linux_i386
@ -292,9 +301,9 @@ stages:
expire_in: "1 day"
when: on_failure
only:
- schedules
- tags
- web
- schedules
.unit_test: &unit_test_job
<<: *default_triggering_rules
@ -592,7 +601,7 @@ scan-build:
<<: *base_image
stage: postcheck
variables:
CC: clang-9
CC: "${CLANG}"
CFLAGS: "${CFLAGS_COMMON}"
CONFIGURE: "${SCAN_BUILD} ./configure"
EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
@ -1051,30 +1060,6 @@ unit:clang:buster:amd64:
- job: clang:buster:amd64
artifacts: true
# Jobs for nocrypto builds
nocrypto:
variables:
CC: gcc
CFLAGS: "-Wall -Wextra -Og -g"
EXTRA_CONFIGURE: "--with-openssl=no"
<<: *base_image
<<: *build_job
system:nocrypto:
<<: *base_image
<<: *system_test_job
needs:
- job: nocrypto
artifacts: true
unit:nocrypto:
<<: *base_image
<<: *unit_test_job
needs:
- job: nocrypto
artifacts: true
# Jobs for PKCS#11-enabled GCC builds on Debian Sid (amd64)
pkcs11: