From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BEFFC139085 for ; Mon, 23 Jan 2017 15:44:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB7B42241BF; Mon, 23 Jan 2017 15:44:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B8952241BF for ; Mon, 23 Jan 2017 15:44:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7DD1E34168F for ; Mon, 23 Jan 2017 15:44:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E7982D19 for ; Mon, 23 Jan 2017 15:44:19 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1485176923.2d45843fd36d1f3b6e0536f9de017a3f59ef2074.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: / X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: .travis.yml X-VCS-Directories: / X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 2d45843fd36d1f3b6e0536f9de017a3f59ef2074 X-VCS-Branch: master Date: Mon, 23 Jan 2017 15:44:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e1893ba9-71d6-4c1e-99ba-277ca9565ab4 X-Archives-Hash: 91f3a61af11cc29b66aed213650cf3af commit: 2d45843fd36d1f3b6e0536f9de017a3f59ef2074 Author: cgzones googlemail com> AuthorDate: Fri Jan 6 18:45:09 2017 +0000 Commit: Jason Zaman gentoo org> CommitDate: Mon Jan 23 13:08:43 2017 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=2d45843f use travis cache cache SELinux userspace build .travis.yml | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 58533e6..4848b29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,10 @@ sudo: false #sudo: required #dist: trusty +cache: + directories: + - ${TRAVIS_BUILD_DIR}/selinux + addons: apt: packages: @@ -62,33 +66,39 @@ before_install: - python -V install: - # Download current SELinux userspace tools and libraries - - curl -sS -L https://github.com/SELinuxProject/selinux/archive/20161014.tar.gz | tar xz - - mv selinux-20161014 selinux-src + - SELINUX_USERSPACE_VERSION=20161014 + + - | + if [[ "${SELINUX_USERSPACE_VERSION}" != "$(cat ${TRAVIS_BUILD_DIR}/selinux/travis.version)" ]]; then + # Download current SELinux userspace tools and libraries + curl -sS -L "https://github.com/SELinuxProject/selinux/archive/${SELINUX_USERSPACE_VERSION}.tar.gz" | tar xz + mv "selinux-${SELINUX_USERSPACE_VERSION}" selinux-src - # Ubuntu 12.04 coreutils is too old to provide "ln --relative" :( - - sed 's/ln -sf --relative /ln -sf /' -i selinux-src/libsepol/src/Makefile - - sed 's/ln -sf --relative /ln -sf /' -i selinux-src/libselinux/src/Makefile + # Ubuntu 12.04 coreutils is too old to provide "ln --relative" :( + sed 's/ln -sf --relative /ln -sf /' -i selinux-src/libsepol/src/Makefile + sed 's/ln -sf --relative /ln -sf /' -i selinux-src/libselinux/src/Makefile - # Drop secilc to break xmlto dependence (secilc isn't used here anyway) - - sed -i -e 's/secilc//' selinux-src/Makefile + # Drop secilc to break xmlto dependence (secilc isn't used here anyway) + sed -i -e 's/secilc//' selinux-src/Makefile - # Drop sepolicy to break setools dependence (sepolicy isn't used anyway) - - sed -i -e 's/sepolicy//' selinux-src/policycoreutils/Makefile + # Drop sepolicy to break setools dependence (sepolicy isn't used anyway) + sed -i -e 's/sepolicy//' selinux-src/policycoreutils/Makefile - # Drop restorecond to break glib dependence - - sed -i -e 's/ restorecond//' selinux-src/policycoreutils/Makefile + # Drop restorecond to break glib dependence + sed -i -e 's/ restorecond//' selinux-src/policycoreutils/Makefile - # Drop sandbox to break libcap-ng dependence - - sed -i -e 's/ sandbox//' selinux-src/policycoreutils/Makefile + # Drop sandbox to break libcap-ng dependence + sed -i -e 's/ sandbox//' selinux-src/policycoreutils/Makefile - # Compile and install SELinux toolchain into ~/selinux - # On Ubuntu 12.04, default CFLAGS make the build fail in libsepol/cil with: - # error: declaration of 'index' shadows a global declarationo - - make "DESTDIR=$TRAVIS_BUILD_DIR/selinux" CFLAGS="-O2 -Wall" -C selinux-src install + # Compile and install SELinux toolchain into ~/selinux + # On Ubuntu 12.04, default CFLAGS make the build fail in libsepol/cil with: + # error: declaration of 'index' shadows a global declarationo + make "DESTDIR=${TRAVIS_BUILD_DIR}/selinux" CFLAGS="-O2 -Wall" -C selinux-src install + echo "${SELINUX_USERSPACE_VERSION}" > "${TRAVIS_BUILD_DIR}/selinux/travis.version" + fi # Use TEST_TOOLCHAIN variable to tell refpolicy Makefile about the installed location - - export TEST_TOOLCHAIN="$TRAVIS_BUILD_DIR/selinux" + - export TEST_TOOLCHAIN="${TRAVIS_BUILD_DIR}/selinux" # Drop build.conf settings to listen to env vars - sed -r -i -e '/(DIRECT_INITRC|MONOLITHIC|TYPE|DISTRO|SYSTEMD)/d' build.conf