From e3db4dc898a65d75d1cf45325ab1e2c9f477eaa3 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 2 Sep 2017 09:45:43 -0400 Subject: [PATCH] CI: Enable CentOS Continuous Release (CR) repository for oldgcc target With things in flux between CentOS and EPEL while CentOS 7.4 is prepared, the CR repository will ensure dependencies can be found for EPEL. Since EPEL targets Red Hat Enterprise Linux specifically, EPEL for RHEL 7 has already moved onto RHEL 7.4, but CentOS 7.4 hasn't been released yet. --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78b2dfe..728cd03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ cache: variables: YUMDNF: dnf EXTRA_REPO_INST_COMMAND: /bin/true + EXTRA_REPO_CONFIGURE_COMMAND: /bin/true JPEG_PACKAGE: "pkgconfig(libjpeg)" CMAKE_PACKAGE: "/usr/bin/cmake" DEPENDENCY_PACKAGES: "pkgconfig(openal) pkgconfig(sdl2) pkgconfig(glu) pkgconfig(libpng) pkgconfig(vorbis) pkgconfig(vorbisfile) pkgconfig(ogg)" @@ -15,13 +16,15 @@ variables: before_script: - $EXTRA_REPO_INST_COMMAND + - $EXTRA_REPO_CONFIGURE_COMMAND - $YUMDNF --quiet --assumeyes install $COMMON_PACKAGES build_oldgcc: image: centos:7 variables: YUMDNF: yum - EXTRA_REPO_INST_COMMAND: "yum --quiet --assumeyes install epel-release" + EXTRA_REPO_INST_COMMAND: "yum --quiet --assumeyes install epel-release yum-utils" + EXTRA_REPO_CONFIGURE_COMMAND: "yum-config-manager --enable cr" JPEG_PACKAGE: "libjpeg-devel" CMAKE_PACKAGE: "/usr/bin/cmake3" COMPILER_PACKAGES: "gcc gcc-c++" -- 2.39.5