From 1d471c8e94e1d239f571cbbbd4788cc1df340811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Milk?= <rene.milk@wwu.de>
Date: Thu, 8 Feb 2018 13:56:52 +0100
Subject: [PATCH] [ci] restrict ninja to 1 proc again since we are exhausting
vmem
---
.travis.after_script.bash | 10 ----------
.travis.make_env_file.py | 7 -------
.travis.script.bash | 17 ++++-------------
.travis.yml | 9 ++++-----
4 files changed, 8 insertions(+), 35 deletions(-)
diff --git a/.travis.after_script.bash b/.travis.after_script.bash
index 4a989a748..4983df1eb 100755
--- a/.travis.after_script.bash
+++ b/.travis.after_script.bash
@@ -1,18 +1,8 @@
#!/bin/bash
-#
-# This file is part of the dune-xt-la project:
-# https://github.com/dune-community/dune-xt-la
-# Copyright 2009-2018 dune-xt-la developers and contributors. All rights reserved.
-# License: Dual licensed as BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
-# Authors:
-# Felix Schindler (2017)
-# Rene Milk (2017 - 2018)
# ****** THIS FILE IS AUTOGENERATED, DO NOT EDIT **********
# this file is treated as a jinja2 template
-${DUNE_VENV_ACTIVATE}
-
WAIT="${SUPERDIR}/scripts/bash/travis_wait_new.bash 45"
source ${SUPERDIR}/scripts/bash/retry_command.bash
diff --git a/.travis.make_env_file.py b/.travis.make_env_file.py
index 35e26f73f..f2e925bdb 100644
--- a/.travis.make_env_file.py
+++ b/.travis.make_env_file.py
@@ -1,11 +1,4 @@
#!/usr/bin/env python3
-#
-# This file is part of the dune-xt-la project:
-# https://github.com/dune-community/dune-xt-la
-# Copyright 2009-2018 dune-xt-la developers and contributors. All rights reserved.
-# License: Dual licensed as BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
-# Authors:
-# Rene Milk (2017 - 2018)
import os
from os.path import expanduser
diff --git a/.travis.script.bash b/.travis.script.bash
index 70d2d21a4..ae717cad9 100755
--- a/.travis.script.bash
+++ b/.travis.script.bash
@@ -1,12 +1,4 @@
#!/bin/bash
-#
-# This file is part of the dune-xt-la project:
-# https://github.com/dune-community/dune-xt-la
-# Copyright 2009-2018 dune-xt-la developers and contributors. All rights reserved.
-# License: Dual licensed as BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
-# Authors:
-# Felix Schindler (2017)
-# Rene Milk (2017 - 2018)
# ****** THIS FILE IS AUTOGENERATED, DO NOT EDIT **********
# this file is treated as a jinja2 template
@@ -14,17 +6,15 @@
set -e
set -x
-${DUNE_VENV_ACTIVATE}
-
WAIT="${SUPERDIR}/scripts/bash/travis_wait_new.bash 45"
source ${SUPERDIR}/scripts/bash/retry_command.bash
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} configure
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD}
if [ x"${TESTS}" == x ] ; then
- ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -v test_binaries
+ ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v test_binaries
else
- ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -v test_binaries_builder_${TESTS}
+ ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v test_binaries_builder_${TESTS}
fi
source ${OPTS}
@@ -32,8 +22,9 @@ CTEST="ctest -V --timeout ${DXT_TEST_TIMEOUT:-300} -j ${DXT_TEST_PROCS:-2}"
if [ x"${TESTS}" == x ] ; then
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${CTEST}
- ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} headercheck
+ ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 headercheck
else
+ # with binning headercheck is included in building tests
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${CTEST} -L "^builder_${TESTS}$"
fi
diff --git a/.travis.yml b/.travis.yml
index 6386b2f7d..c6c8ffe0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,13 @@
# This file is part of the dune-xt-la project:
# https://github.com/dune-community/dune-xt-la
-# Copyright 2009-2018 dune-xt-la developers and contributors. All rights reserved.
+# Copyright 2009-2017 dune-xt-functions developers and contributors. All rights reserved.
# License: Dual licensed as BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
+# or GPL-2.0+ (http://opensource.org/licenses/gpl-license)
+# with "runtime exception" (http://www.dune-project.org/license.html)
# Authors:
# Felix Schindler (2016 - 2017)
-# Rene Milk (2016 - 2018)
+# Rene Milk (2016 - 2017)
# Tobias Leibner (2016)
-#
-# or GPL-2.0+ (http://opensource.org/licenses/gpl-license)
-# with "runtime exception" (http://www.dune-project.org/license.html)
sudo: required
dist: trusty
--
GitLab