Permalink
Browse files

Merge branch 'remove_ubuntu_1510' into 'master'

Remove support for Ubuntu 15.10

See merge request !231
  • Loading branch information...
mhochsteger committed Sep 15, 2017
2 parents 30c0db0 + 97d58d3 commit 35e446107009bc9872dbe1a1a893fcc6fdad5945
Showing with 1 addition and 15 deletions.
  1. +0 −14 .gitlab-ci.yml
  2. +1 −1 CMakeLists.txt
@@ -53,12 +53,6 @@ stages:
- ls
- docker info
.template_ubuntu_1510: &ubuntu_1510
<<: *ubuntu
variables:
UBUNTU_VERSION: "15.10"
UBUNTU_VERSION_NAME: "wily"
.template_ubuntu_1604: &ubuntu_1604
<<: *ubuntu
variables:
@@ -152,10 +146,6 @@ win64_build:
bash /root/src/ngsolve/tests/build.sh
- docker commit `cat ngsolve_${CI_PIPELINE_ID}_$UBUNTU_VERSION.id` ngsolve_${CI_PIPELINE_ID}_installed:$UBUNTU_VERSION
ubuntu_1510_build:
<<: *ubuntu_1510
<<: *build_linux
ubuntu_1604_build:
<<: *ubuntu_1604
<<: *build_linux
@@ -236,10 +226,6 @@ win64_test:
ngsolve_${CI_PIPELINE_ID}_installed:$UBUNTU_VERSION
bash -c 'cd /root/build/ngsolve && make test_ngsolve ARGS="--output-on-failure"'
ubuntu_1510_test:
<<: *ubuntu_1510
<<: *test_linux
ubuntu_1604_test:
<<: *ubuntu_1604
<<: *test_linux
@@ -2,7 +2,7 @@ if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING INTERNAL)
endif(NOT CMAKE_BUILD_TYPE)
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.3)
# Handle superbuild first
option( USE_SUPERBUILD "Whether or not a superbuild should be invoked" ON)

0 comments on commit 35e4461

Please sign in to comment.