X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=.gitlab-ci.yml;h=728cd033909f85c3294fa1db073ee6f2db6f617e;hp=a65f3487737f9bf0294ca6d913a905eb6ad897e3;hb=refs%2Fheads%2Fimprovements;hpb=438c1f04f5a31edba4cfe66dd57945bf2fe0fc04

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a65f348..728cd03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,20 +8,23 @@ 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(zlib) pkgconfig(vorbis) pkgconfig(vorbisfile) pkgconfig(ogg)"
+  DEPENDENCY_PACKAGES: "pkgconfig(openal) pkgconfig(sdl2) pkgconfig(glu) pkgconfig(libpng) pkgconfig(vorbis) pkgconfig(vorbisfile) pkgconfig(ogg)"
   COMMON_PACKAGES: "$COMPILER_PACKAGES $CMAKE_PACKAGE make $DEPENDENCY_PACKAGES $JPEG_PACKAGE"
 
 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++"
@@ -74,7 +77,7 @@ build_mingw32:
   stage: build
   variables:
     COMPILER_PACKAGES: "mingw32-gcc mingw32-gcc-c++ mingw32-binutils mingw32-headers"
-    DEPENDENCY_PACKAGES: "mingw32-libjpeg-turbo mingw32-libpng mingw32-SDL2 mingw32-zlib mingw32-libvorbis mingw32-libogg mingw32-openal-soft"
+    DEPENDENCY_PACKAGES: "mingw32-libjpeg-turbo mingw32-libpng mingw32-SDL2 mingw32-libvorbis mingw32-libogg mingw32-openal-soft"
   script:
     - export PKG_CONFIG_LIBDIR="/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig"
     - export PATH=/usr/i686-w64-mingw32/bin:$PATH
@@ -92,7 +95,7 @@ build_mingw64:
   stage: build
   variables:
     COMPILER_PACKAGES: "mingw64-gcc mingw64-gcc-c++ mingw64-binutils mingw64-headers"
-    DEPENDENCY_PACKAGES: "mingw64-libjpeg-turbo mingw64-libpng mingw64-SDL2 mingw64-zlib mingw64-libvorbis mingw64-libogg mingw64-openal-soft"
+    DEPENDENCY_PACKAGES: "mingw64-libjpeg-turbo mingw64-libpng mingw64-SDL2 mingw64-libvorbis mingw64-libogg mingw64-openal-soft"
   script:
     - export PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig"
     - export PATH=/usr/x86_64-w64-mingw32/bin:$PATH