Replace CentOS 7 & 8 with Oracle Linux

This commit is contained in:
Michal Nowak
2021-06-15 09:49:21 +02:00
parent ba181fe83d
commit 3085edf1a0
3 changed files with 28 additions and 28 deletions

View File

@@ -100,14 +100,14 @@ stages:
image: "$CI_REGISTRY_IMAGE:alpine-3.14-amd64" image: "$CI_REGISTRY_IMAGE:alpine-3.14-amd64"
<<: *linux_amd64 <<: *linux_amd64
# CentOS # Oracle Linux
.centos-centos7-amd64: &centos_centos7_amd64_image .oraclelinux-7-amd64: &oraclelinux_7_amd64_image
image: "$CI_REGISTRY_IMAGE:centos-centos7-amd64" image: "$CI_REGISTRY_IMAGE:oraclelinux-7-amd64"
<<: *linux_amd64 <<: *linux_amd64
.centos-centos8-amd64: &centos_centos8_amd64_image .oraclelinux-8-amd64: &oraclelinux_8_amd64_image
image: "$CI_REGISTRY_IMAGE:centos-centos8-amd64" image: "$CI_REGISTRY_IMAGE:oraclelinux-8-amd64"
<<: *linux_amd64 <<: *linux_amd64
# Debian # Debian
@@ -564,52 +564,52 @@ unit:gcc:alpine3.14:amd64:
- job: gcc:alpine3.14:amd64 - job: gcc:alpine3.14:amd64
artifacts: true artifacts: true
# Jobs for regular GCC builds on CentOS 7 (amd64) # Jobs for regular GCC builds on Oracle Linux 7 (amd64)
gcc:centos7:amd64: gcc:oraclelinux7:amd64:
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON}" CFLAGS: "${CFLAGS_COMMON}"
EXTRA_CONFIGURE: "--with-libidn2" EXTRA_CONFIGURE: "--with-libidn2"
<<: *centos_centos7_amd64_image <<: *oraclelinux_7_amd64_image
<<: *build_job <<: *build_job
system:gcc:centos7:amd64: system:gcc:oraclelinux7:amd64:
<<: *centos_centos7_amd64_image <<: *oraclelinux_7_amd64_image
<<: *system_test_job <<: *system_test_job
needs: needs:
- job: gcc:centos7:amd64 - job: gcc:oraclelinux7:amd64
artifacts: true artifacts: true
unit:gcc:centos7:amd64: unit:gcc:oraclelinux7:amd64:
<<: *centos_centos7_amd64_image <<: *oraclelinux_7_amd64_image
<<: *unit_test_job <<: *unit_test_job
needs: needs:
- job: gcc:centos7:amd64 - job: gcc:oraclelinux7:amd64
artifacts: true artifacts: true
# Jobs for regular GCC builds on CentOS 8 (amd64) # Jobs for regular GCC builds on Oracle Linux 8 (amd64)
gcc:centos8:amd64: gcc:oraclelinux8:amd64:
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON}" CFLAGS: "${CFLAGS_COMMON}"
EXTRA_CONFIGURE: "--enable-buffer-useinline --with-libidn2" EXTRA_CONFIGURE: "--enable-buffer-useinline --with-libidn2"
<<: *centos_centos8_amd64_image <<: *oraclelinux_8_amd64_image
<<: *build_job <<: *build_job
system:gcc:centos8:amd64: system:gcc:oraclelinux8:amd64:
<<: *centos_centos8_amd64_image <<: *oraclelinux_8_amd64_image
<<: *system_test_job <<: *system_test_job
needs: needs:
- job: gcc:centos8:amd64 - job: gcc:oraclelinux8:amd64
artifacts: true artifacts: true
unit:gcc:centos8:amd64: unit:gcc:oraclelinux8:amd64:
<<: *centos_centos8_amd64_image <<: *oraclelinux_8_amd64_image
<<: *unit_test_job <<: *unit_test_job
needs: needs:
- job: gcc:centos8:amd64 - job: gcc:oraclelinux8:amd64
artifacts: true artifacts: true
# Jobs for regular GCC builds on Debian 9 "stretch" (amd64) # Jobs for regular GCC builds on Debian 9 "stretch" (amd64)

View File

@@ -63,7 +63,7 @@ following systems:
* Debian 9, 10 * Debian 9, 10
* Ubuntu LTS 18.04, 20.04 * Ubuntu LTS 18.04, 20.04
* Fedora 34 * Fedora 34
* Red Hat Enterprise Linux / CentOS 7, 8 * Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8
* FreeBSD 11.4, 12.2, 13.0 * FreeBSD 11.4, 12.2, 13.0
* OpenBSD 6.9 * OpenBSD 6.9
* Alpine Linux 3.14 * Alpine Linux 3.14

View File

@@ -133,10 +133,10 @@ capability support at compile time. See [Compile-time options](#opts)
below for details on other libraries that may be required to support below for details on other libraries that may be required to support
optional features. optional features.
Successful builds have been observed on many versions of Linux and Successful builds have been observed on many versions of Linux and Unix,
Unix, including RHEL/CentOS, Fedora, Debian, Ubuntu, SLES, openSUSE, including RHEL/CentOS/Oracle Linux, Fedora, Debian, Ubuntu, SLES, openSUSE,
Slackware, Alpine, FreeBSD, NetBSD, OpenBSD, macOS, Solaris, Slackware, Alpine, FreeBSD, NetBSD, OpenBSD, macOS, Solaris, OpenIndiana,
OpenIndiana, OmniOS CE, HP-UX, and OpenWRT. OmniOS CE, HP-UX, and OpenWRT.
To build on a Unix or Linux system, use: To build on a Unix or Linux system, use: