summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-05-07 02:00:23 +0300
committerAndrei Karas <akaras@inbox.ru>2018-05-07 02:00:23 +0300
commit113e5e803d49d9b38b8031d46b7df5af660c4bd1 (patch)
treeb0493f94c4972e6a0e65db38bdf2d2a0efed461c /tools
parent7913084817a6c6a18b1125cb8794210d56ec90b6 (diff)
downloadplus-113e5e803d49d9b38b8031d46b7df5af660c4bd1.tar.gz
plus-113e5e803d49d9b38b8031d46b7df5af660c4bd1.tar.bz2
plus-113e5e803d49d9b38b8031d46b7df5af660c4bd1.tar.xz
plus-113e5e803d49d9b38b8031d46b7df5af660c4bd1.zip
Remove CILK builds from branches.s20180518
Diffstat (limited to 'tools')
-rw-r--r--tools/ci/branches/ci_gcc49/.gitlab-ci.yml14
-rw-r--r--tools/ci/branches/ci_gcc5/.gitlab-ci.yml13
-rw-r--r--tools/ci/branches/ci_gcc6/.gitlab-ci.yml13
-rw-r--r--tools/ci/branches/ci_main1/.gitlab-ci.yml13
4 files changed, 0 insertions, 53 deletions
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: