Commit 51ec36c8 authored by Michał Kępień's avatar Michał Kępień
Browse files

Merge branch 'michal/update-gitlab-ci-to-fedora-30' into 'master'

Update GitLab CI to Fedora 30

See merge request !2196
parents 7c210a2b fac23cf9
Pipeline #18627 passed with stages
in 1 minute and 18 seconds
...@@ -78,8 +78,8 @@ stages: ...@@ -78,8 +78,8 @@ stages:
# Fedora # Fedora
.fedora-29-amd64: &fedora_29_amd64_image .fedora-30-amd64: &fedora_30_amd64_image
image: "$CI_REGISTRY_IMAGE:fedora-29-amd64" image: "$CI_REGISTRY_IMAGE:fedora-30-amd64"
<<: *linux_amd64 <<: *linux_amd64
# Ubuntu # Ubuntu
...@@ -445,27 +445,27 @@ unit:gcc:sid:i386: ...@@ -445,27 +445,27 @@ unit:gcc:sid:i386:
dependencies: dependencies:
- gcc:sid:i386 - gcc:sid:i386
# Jobs for regular GCC builds on Fedora 29 (amd64) # Jobs for regular GCC builds on Fedora 30 (amd64)
gcc:fedora29:amd64: gcc:fedora30:amd64:
variables: variables:
CC: gcc CC: gcc
CFLAGS: "-Wall -Wextra -O2 -g" CFLAGS: "-Wall -Wextra -O2 -g"
EXTRA_CONFIGURE: "--with-libidn2" EXTRA_CONFIGURE: "--with-libidn2"
<<: *fedora_29_amd64_image <<: *fedora_30_amd64_image
<<: *build_job <<: *build_job
system:gcc:fedora29:amd64: system:gcc:fedora30:amd64:
<<: *fedora_29_amd64_image <<: *fedora_30_amd64_image
<<: *system_test_job <<: *system_test_job
dependencies: dependencies:
- gcc:fedora29:amd64 - gcc:fedora30:amd64
unit:gcc:fedora29:amd64: unit:gcc:fedora30:amd64:
<<: *fedora_29_amd64_image <<: *fedora_30_amd64_image
<<: *unit_test_job <<: *unit_test_job
dependencies: dependencies:
- gcc:fedora29:amd64 - gcc:fedora30:amd64
# Jobs for regular GCC builds on Ubuntu 16.04 Xenial Xerus (amd64) # Jobs for regular GCC builds on Ubuntu 16.04 Xenial Xerus (amd64)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment