From 067088bbff42ca2fb9106acf309f1d9ce3e78ada Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Fri, 22 Feb 2019 18:21:44 -0600 Subject: move ci scripts to their own directory This fixes #296. --- .cirrus.yml | 2 +- .travis.yml | 2 +- ci/cirrus.sh | 21 +++++++++++++++++++++ ci/travis.sh | 23 +++++++++++++++++++++++ test/cirrus.sh | 21 --------------------- test/travis.sh | 23 ----------------------- 6 files changed, 46 insertions(+), 46 deletions(-) create mode 100755 ci/cirrus.sh create mode 100755 ci/travis.sh delete mode 100755 test/cirrus.sh delete mode 100755 test/travis.sh diff --git a/.cirrus.yml b/.cirrus.yml index dac47fc8..affbb98a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -12,4 +12,4 @@ test_task: [ -f /proc/curproc ] || mount -t procfs proc /proc pkg_install_script: pkg install -y bash gawk gmake gsed gsed_hack_script: rm /usr/bin/sed && ln -s /usr/local/bin/gsed /usr/bin/sed - test_script: bash test/cirrus.sh + test_script: bash ci/cirrus.sh diff --git a/.travis.yml b/.travis.yml index 4571a6ca..3651dbe6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,4 +25,4 @@ notifications: on_start: false # default: false script: - - ./test/travis.sh + - ./ci/travis.sh diff --git a/ci/cirrus.sh b/ci/cirrus.sh new file mode 100755 index 00000000..286dd360 --- /dev/null +++ b/ci/cirrus.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# Copyright (c) 2007-2018 The OpenRC Authors. +# See the Authors file at the top-level directory of this distribution and +# https://github.com/OpenRC/openrc/blob/master/AUTHORS +# +# This file is part of OpenRC. It is subject to the license terms in +# the LICENSE file found in the top-level directory of this +# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE +# This file may not be copied, modified, propagated, or distributed +# except according to the terms contained in the LICENSE file. + +set -e +set -u +set -x + +# These are steps to run on Cirrus CI under a jailed FreeBSD system. +# See $TOP/.cirrus.yml for more info about the Cirrus CI setup. + +cpus=$(getconf NPROCESSORS_CONF || echo 1) +gmake -j"${cpus}" -O +gmake test diff --git a/ci/travis.sh b/ci/travis.sh new file mode 100755 index 00000000..9626894c --- /dev/null +++ b/ci/travis.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# Copyright (c) 2007-2018 The OpenRC Authors. +# See the Authors file at the top-level directory of this distribution and +# https://github.com/OpenRC/openrc/blob/master/AUTHORS +# +# This file is part of OpenRC. It is subject to the license terms in +# the LICENSE file found in the top-level directory of this +# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE +# This file may not be copied, modified, propagated, or distributed +# except according to the terms contained in the LICENSE file. + +set -e +set -u +set -x + +# These are steps to run on TravisCI under a containerized Ubuntu system. +# See $TOP/.travis.yml for more info about the TravisCI setup. + +cpus=$(getconf _NPROCESSORS_CONF || echo 1) +# make on TravisCI doesn't support -O yet +make -j"${cpus}" + +make test diff --git a/test/cirrus.sh b/test/cirrus.sh deleted file mode 100755 index 286dd360..00000000 --- a/test/cirrus.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# Copyright (c) 2007-2018 The OpenRC Authors. -# See the Authors file at the top-level directory of this distribution and -# https://github.com/OpenRC/openrc/blob/master/AUTHORS -# -# This file is part of OpenRC. It is subject to the license terms in -# the LICENSE file found in the top-level directory of this -# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE -# This file may not be copied, modified, propagated, or distributed -# except according to the terms contained in the LICENSE file. - -set -e -set -u -set -x - -# These are steps to run on Cirrus CI under a jailed FreeBSD system. -# See $TOP/.cirrus.yml for more info about the Cirrus CI setup. - -cpus=$(getconf NPROCESSORS_CONF || echo 1) -gmake -j"${cpus}" -O -gmake test diff --git a/test/travis.sh b/test/travis.sh deleted file mode 100755 index 9626894c..00000000 --- a/test/travis.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# Copyright (c) 2007-2018 The OpenRC Authors. -# See the Authors file at the top-level directory of this distribution and -# https://github.com/OpenRC/openrc/blob/master/AUTHORS -# -# This file is part of OpenRC. It is subject to the license terms in -# the LICENSE file found in the top-level directory of this -# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE -# This file may not be copied, modified, propagated, or distributed -# except according to the terms contained in the LICENSE file. - -set -e -set -u -set -x - -# These are steps to run on TravisCI under a containerized Ubuntu system. -# See $TOP/.travis.yml for more info about the TravisCI setup. - -cpus=$(getconf _NPROCESSORS_CONF || echo 1) -# make on TravisCI doesn't support -O yet -make -j"${cpus}" - -make test -- cgit v1.2.3