X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=.gitlab-ci.yml;fp=.gitlab-ci.yml;h=728cd033909f85c3294fa1db073ee6f2db6f617e;hp=78b2dfe598979535f23573fed071ed221ea92a88;hb=e3db4dc898a65d75d1cf45325ab1e2c9f477eaa3;hpb=be5fc624393b132863a7d9a97c811bc695b86e5b 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++"