From 113e5e803d49d9b38b8031d46b7df5af660c4bd1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 7 May 2018 02:00:23 +0300 Subject: Remove CILK builds from branches. --- tools/ci/branches/ci_gcc49/.gitlab-ci.yml | 14 -------------- tools/ci/branches/ci_gcc5/.gitlab-ci.yml | 13 ------------- tools/ci/branches/ci_gcc6/.gitlab-ci.yml | 13 ------------- tools/ci/branches/ci_main1/.gitlab-ci.yml | 13 ------------- 4 files changed, 53 deletions(-) (limited to 'tools') diff --git a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml index 214a19a63..7f351a02e 100644 --- a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml @@ -202,20 +202,6 @@ cmake_gcc-4.9: tags: - docker -gcc49_cilkplus: - stage: build - script: - - ./tools/ci/jobs/gcc49.sh --enable-cilkplus - - ./tools/ci/scripts/runtests.sh - image: debian:jessie - <<: *job-push - variables: - PACKAGES: gcc-4.9 g++-4.9 - 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 - gdb valgrind netcat-openbsd procps git - gcc-4.9_sdl2: stage: build script: diff --git a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml index 33140a10a..6fc561ce1 100644 --- a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml @@ -288,19 +288,6 @@ gcc-5_sdl2_c++11_i386: tags: - docker -gcc-5_cilkplus: - stage: build - script: - - ./tools/ci/jobs/gcc5.sh --enable-cilkplus - - ./tools/ci/scripts/runtests.sh - <<: *job-push - variables: - PACKAGES: gcc-5 g++-5 - 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 - git gdb valgrind netcat-openbsd procps - gcc-5_default: stage: build script: diff --git a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml index 8824ebfa4..a30eac791 100644 --- a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml @@ -191,19 +191,6 @@ gcc-6_lto_i386: tags: - docker -gcc-6_cilkplus: - stage: build - script: - - ./tools/ci/jobs/gcc6.sh --enable-cilkplus - - ./tools/ci/scripts/runtests.sh - <<: *job-push - variables: - PACKAGES: gcc-6 g++-6 - 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 - git gdb valgrind netcat-openbsd procps - gcc-6_default_i386: stage: build script: diff --git a/tools/ci/branches/ci_main1/.gitlab-ci.yml b/tools/ci/branches/ci_main1/.gitlab-ci.yml index cf79ba9f9..b6ad309d5 100644 --- a/tools/ci/branches/ci_main1/.gitlab-ci.yml +++ b/tools/ci/branches/ci_main1/.gitlab-ci.yml @@ -166,19 +166,6 @@ gcc7_without_mumble_sdl2: libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev git gdb valgrind netcat-openbsd procps -gcc-7_cilkplus: - stage: build - script: - - ./tools/ci/jobs/gcc7.sh --enable-cilkplus - - ./tools/ci/scripts/runtests.sh - <<: *job-push - variables: - PACKAGES: gcc-7 g++-7 - 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 - git gdb valgrind netcat-openbsd procps - gcc_portable: stage: build script: -- cgit v1.2.3-70-g09d2