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 16FFA138334 for ; Sat, 13 Jul 2019 07:01:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D36EE0801; Sat, 13 Jul 2019 07:01:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 569CAE0801 for ; Sat, 13 Jul 2019 07:01:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE97C3478FB for ; Sat, 13 Jul 2019 07:01:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E5146EA for ; Sat, 13 Jul 2019 07:01:13 +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: <1556448183.18ab255a88e32bf5a90ebee26ad957117645358d.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: 18ab255a88e32bf5a90ebee26ad957117645358d X-VCS-Branch: master Date: Sat, 13 Jul 2019 07:01:13 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 02d06ffb-ccb7-46a1-8e2a-e3c9bf5c1a8e X-Archives-Hash: 2518c7fc4fccc71602485ee7f08907df commit: 18ab255a88e32bf5a90ebee26ad957117645358d Author: Jason Zaman perfinion com> AuthorDate: Sun Apr 28 10:34:36 2019 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sun Apr 28 10:43:03 2019 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=18ab255a .travis.yml: Remove DIRECT_INITRC from test matrix commit 53db187a5aa702c59b8905509536c56c2867b3a8 init: Revise conditions in init_startstop_service(). broke DIRECT_INITRC=y, and it is not supported on Gentoo anyway, so just drop it from the test matrix. Signed-off-by: Jason Zaman perfinion.com> .travis.yml | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f2360bd..a79aee8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,30 +8,18 @@ matrix: # for T in standard mls mcs ; do for D in arch debian gentoo ; do for I in n y ; do for M in y n ; do for S in n y ; do # echo " - TYPE=$T DISTRO=$D DIRECT_INITRC=$I MONOLITHIC=$M SYSTEMD=$S" ; done ; done ; done ; done ; done env: - - TYPE=standard DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=y SYSTEMD=n WERROR=y - - TYPE=standard DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=y SYSTEMD=y WERROR=y - - TYPE=standard DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n SYSTEMD=n WERROR=y - - TYPE=standard DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n SYSTEMD=y WERROR=y - - TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y SYSTEMD=n WERROR=y - - TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y SYSTEMD=y WERROR=y - - TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=n WERROR=y - - TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=y WERROR=y - - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=y SYSTEMD=n WERROR=y - - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=y SYSTEMD=y WERROR=y - - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n SYSTEMD=n WERROR=y - - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n SYSTEMD=y WERROR=y - - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y SYSTEMD=n WERROR=y - - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y SYSTEMD=y WERROR=y - - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=n WERROR=y - - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=y WERROR=y - - TYPE=mls DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=y SYSTEMD=n WERROR=y - - TYPE=mls DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=y SYSTEMD=y WERROR=y - - TYPE=mls DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n SYSTEMD=n WERROR=y - - TYPE=mls DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n SYSTEMD=y WERROR=y - - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y SYSTEMD=n WERROR=y - - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y SYSTEMD=y WERROR=y - - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=n WERROR=y - - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=y WERROR=y + - TYPE=standard DISTRO=gentoo MONOLITHIC=n SYSTEMD=n WERROR=y + - TYPE=standard DISTRO=gentoo MONOLITHIC=n SYSTEMD=y WERROR=y + - TYPE=standard DISTRO=gentoo MONOLITHIC=y SYSTEMD=n WERROR=y + - TYPE=standard DISTRO=gentoo MONOLITHIC=y SYSTEMD=y WERROR=y + - TYPE=mcs DISTRO=gentoo MONOLITHIC=n SYSTEMD=n WERROR=y + - TYPE=mcs DISTRO=gentoo MONOLITHIC=n SYSTEMD=y WERROR=y + - TYPE=mcs DISTRO=gentoo MONOLITHIC=y SYSTEMD=n WERROR=y + - TYPE=mcs DISTRO=gentoo MONOLITHIC=y SYSTEMD=y WERROR=y + - TYPE=mls DISTRO=gentoo MONOLITHIC=n SYSTEMD=n WERROR=y + - TYPE=mls DISTRO=gentoo MONOLITHIC=n SYSTEMD=y WERROR=y + - TYPE=mls DISTRO=gentoo MONOLITHIC=y SYSTEMD=n WERROR=y + - TYPE=mls DISTRO=gentoo MONOLITHIC=y SYSTEMD=y WERROR=y sudo: false dist: trusty @@ -92,10 +80,10 @@ install: - 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|WERROR)/d' build.conf + - sed -r -i -e '/(MONOLITHIC|TYPE|DISTRO|SYSTEMD|WERROR)/d' build.conf script: - - echo $TYPE $DISTRO $DIRECT_INITRC $MONOLITHIC $SYSTEMD $WERROR + - echo $TYPE $DISTRO $MONOLITHIC $SYSTEMD $WERROR - set -e - make bare - make conf