From d529370d020ad02e4e727c69f029dfafd606cf56 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 24 Mar 2017 02:30:21 +0300
Subject: Remove one build with physfs. Also remove physfs package from fedora
builds.
---
.gitlab-ci.yml | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56c8fecdb..a44bb6902 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,18 +100,6 @@ gcc-6:
libxml2-dev libcurl4-gnutls-dev libpng-dev
libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
-gcc-6_physfs:
- stage: prebuild
- script:
- - ./tools/ci/jobs/gcc6.sh --with-physfs
- <<: *job-shared
- variables:
- PACKAGES: gcc-6 g++-6
- libphysfs-dev
- make autoconf automake autopoint gettext
- libxml2-dev libcurl4-gnutls-dev libpng-dev
- libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
-
gcc-4.4:
stage: prebuild
script:
@@ -456,7 +444,7 @@ gcc-6_sanitize_physfs_i386:
image: fedora:rawhide
variables:
PMUPDATE: "dnf install --refresh -y @development-tools"
- PMINSTALL: "dnf install -y bash tar findutils gcc gcc-c++ make libpng-devel libcurl-devel libxml2-devel gcc physfs-devel gcc SDL-devel SDL_net-devel SDL_image-devel SDL_ttf-devel SDL_mixer-devel SDL_gfx-devel zlib-devel gettext-devel automake autoconf valgrind libasan liblsan libubsan"
+ PMINSTALL: "dnf install -y bash tar findutils gcc gcc-c++ make libpng-devel libcurl-devel libxml2-devel gcc SDL-devel SDL_net-devel SDL_image-devel SDL_ttf-devel SDL_mixer-devel SDL_gfx-devel zlib-devel gettext-devel automake autoconf valgrind libasan liblsan libubsan"
tags:
- docker
@@ -469,7 +457,7 @@ gcc-6_sanitize_physfs_i386:
image: fedora:rawhide
variables:
PMUPDATE: "dnf install --refresh -y @development-tools"
- PMINSTALL: "dnf install -y bash tar findutils mesa-libGL-devel gcc gcc-c++ make libpng-devel libcurl-devel libxml2-devel gcc physfs-devel gcc SDL2-devel SDL2_net-devel SDL2_image-devel SDL2_ttf-devel SDL2_mixer-devel SDL2_gfx-devel zlib-devel gettext-devel automake autoconf valgrind libasan liblsan libubsan"
+ PMINSTALL: "dnf install -y bash tar findutils mesa-libGL-devel gcc gcc-c++ make libpng-devel libcurl-devel libxml2-devel gcc SDL2-devel SDL2_net-devel SDL2_image-devel SDL2_ttf-devel SDL2_mixer-devel SDL2_gfx-devel zlib-devel gettext-devel automake autoconf valgrind libasan liblsan libubsan"
tags:
- docker
@@ -1772,7 +1760,7 @@ fedora_gcc-snapshot_tests:
image: fedora:rawhide
variables:
PMUPDATE: "dnf install --refresh -y @development-tools"
- PMINSTALL: "dnf install -y bash tar findutils gcc gcc-c++ make libpng-devel libcurl-devel libxml2-devel gcc physfs-devel gcc SDL-devel SDL_net-devel SDL_image-devel SDL_ttf-devel SDL_mixer-devel SDL_gfx-devel zlib-devel gettext-devel automake autoconf valgrind"
+ PMINSTALL: "dnf install -y bash tar findutils gcc gcc-c++ make libpng-devel libcurl-devel libxml2-devel gcc SDL-devel SDL_net-devel SDL_image-devel SDL_ttf-devel SDL_mixer-devel SDL_gfx-devel zlib-devel gettext-devel automake autoconf valgrind"
tags:
- docker
@@ -1784,7 +1772,7 @@ fedora_gcc-snapshot_sdl2_tests:
image: fedora:rawhide
variables:
PMUPDATE: "dnf install --refresh -y @development-tools"
- PMINSTALL: "dnf install -y bash tar findutils mesa-libGL-devel gcc gcc-c++ make libpng-devel libcurl-devel libxml2-devel gcc physfs-devel gcc SDL2-devel SDL2_net-devel SDL2_image-devel SDL2_ttf-devel SDL2_mixer-devel SDL2_gfx-devel zlib-devel gettext-devel automake autoconf valgrind"
+ PMINSTALL: "dnf install -y bash tar findutils mesa-libGL-devel gcc gcc-c++ make libpng-devel libcurl-devel libxml2-devel gcc SDL2-devel SDL2_net-devel SDL2_image-devel SDL2_ttf-devel SDL2_mixer-devel SDL2_gfx-devel zlib-devel gettext-devel automake autoconf valgrind"
tags:
- docker
@@ -1796,7 +1784,7 @@ fedora_gcc-snapshot:
image: fedora:rawhide
variables:
PMUPDATE: "dnf install --refresh -y @development-tools"
- PMINSTALL: "dnf install -y bash tar findutils gcc gcc-c++ make libpng-devel libcurl-devel libxml2-devel gcc physfs-devel gcc SDL-devel SDL_net-devel SDL_image-devel SDL_ttf-devel SDL_mixer-devel SDL_gfx-devel zlib-devel gettext-devel automake autoconf"
+ PMINSTALL: "dnf install -y bash tar findutils gcc gcc-c++ make libpng-devel libcurl-devel libxml2-devel gcc SDL-devel SDL_net-devel SDL_image-devel SDL_ttf-devel SDL_mixer-devel SDL_gfx-devel zlib-devel gettext-devel automake autoconf"
tags:
- docker
@@ -1808,7 +1796,7 @@ fedora_gcc-snapshot_sdl2:
image: fedora:rawhide
variables:
PMUPDATE: "dnf install --refresh -y @development-tools"
- PMINSTALL: "dnf install -y bash tar findutils mesa-libGL-devel gcc gcc-c++ make libpng-devel libcurl-devel libxml2-devel gcc physfs-devel gcc SDL2-devel SDL2_net-devel SDL2_image-devel SDL2_ttf-devel SDL2_mixer-devel SDL2_gfx-devel zlib-devel gettext-devel automake autoconf"
+ PMINSTALL: "dnf install -y bash tar findutils mesa-libGL-devel gcc gcc-c++ make libpng-devel libcurl-devel libxml2-devel gcc SDL2-devel SDL2_net-devel SDL2_image-devel SDL2_ttf-devel SDL2_mixer-devel SDL2_gfx-devel zlib-devel gettext-devel automake autoconf"
tags:
- docker
--
cgit v1.2.3-70-g09d2