summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml33
1 files changed, 30 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fba9c249..d7b9b762b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,14 +8,17 @@ before_script:
- cat /etc/os-release
- pwd
- mkdir logs || true
- - tools/ci/scripts/updaterepos.sh
- - tools/ci/scripts/dockerretry.sh apt-get update
- - tools/ci/scripts/dockerretry.sh apt-get install -y -qq ${PACKAGES}
+ - ${UPDATEREPOS}
+ - tools/ci/scripts/dockerretry.sh ${PMUPDATE}
+ - tools/ci/scripts/dockerretry.sh ${PMINSTALL} ${PACKAGES}
image: debian:unstable
variables:
GET_SOURCES_ATTEMPTS: "5"
ARTIFACT_DOWNLOAD_ATTEMPTS: "5"
+ UPDATEREPOS: "tools/ci/scripts/updaterepos.sh"
+ PMUPDATE: "apt-get update"
+ PMINSTALL: "apt-get install -y -qq"
.job-shared: &job-shared
artifacts:
@@ -1406,6 +1409,30 @@ gcc-5_tarball:
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
+fedora_gcc-snapshot:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gccsnapshot.sh
+ <<: *job-shared
+ 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"
+ tags:
+ - docker
+
+fedora_gcc-snapshot_sdl2:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gccsnapshot_sdl2.sh
+ <<: *job-shared
+ 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"
+ tags:
+ - docker
+
# build with other libs versions
gcc-6_zlib_v1.2.3.9: