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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EBCC2158020 for ; Wed, 2 Nov 2022 14:43:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4453CE0A89; Wed, 2 Nov 2022 14:42:57 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CACDE0A89 for ; Wed, 2 Nov 2022 14:42:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 666DF340F83 for ; Wed, 2 Nov 2022 14:42:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A95773C for ; Wed, 2 Nov 2022 14:42:53 +0000 (UTC) From: "Kenton Groombridge" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kenton Groombridge" Message-ID: <1667398225.6208749672b0f6d06a417680f8f3101069ab0dce.concord@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: .github/workflows/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: .github/workflows/tests.yml X-VCS-Directories: .github/workflows/ X-VCS-Committer: concord X-VCS-Committer-Name: Kenton Groombridge X-VCS-Revision: 6208749672b0f6d06a417680f8f3101069ab0dce X-VCS-Branch: master Date: Wed, 2 Nov 2022 14:42:53 +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: 2f9b16dc-009b-467e-abd7-bfb11ca13237 X-Archives-Hash: 5245f4e5fea624759fc6b1d5997482e3 commit: 6208749672b0f6d06a417680f8f3101069ab0dce Author: Dave Sugar gmail com> AuthorDate: Sat Oct 8 00:41:22 2022 +0000 Commit: Kenton Groombridge gentoo org> CommitDate: Wed Nov 2 14:10:25 2022 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=62087496 Add 'DIRECT_INITRC' config to automated tests Signed-off-by: Dave Sugar gmail.com> Signed-off-by: Kenton Groombridge gentoo.org> .github/workflows/tests.yml | 58 ++++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d45ac7f23..c097331c2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -63,24 +63,42 @@ jobs: matrix: build-opts: - - {type: standard, distro: gentoo, monolithic: y, systemd: y} - - {type: standard, distro: gentoo, monolithic: y, systemd: n} - - {type: standard, distro: gentoo, monolithic: n, systemd: y} - - {type: standard, distro: gentoo, monolithic: n, systemd: n} - - {type: mcs, distro: gentoo, monolithic: y, systemd: y} - - {type: mcs, distro: gentoo, monolithic: y, systemd: n} - - {type: mcs, distro: gentoo, monolithic: n, systemd: y} - - {type: mcs, distro: gentoo, monolithic: n, systemd: n} - - {type: mls, distro: gentoo, monolithic: y, systemd: y} - - {type: mls, distro: gentoo, monolithic: y, systemd: n} - - {type: mls, distro: gentoo, monolithic: n, systemd: y} - - {type: mls, distro: gentoo, monolithic: n, systemd: n} - - {type: standard, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined} - - {type: standard, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined} - - {type: mcs, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined} - - {type: mcs, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined} - - {type: mls, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined} - - {type: mls, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined} + - {type: standard, distro: gentoo, monolithic: y, systemd: y, direct_initrc: n} + - {type: standard, distro: gentoo, monolithic: y, systemd: n, direct_initrc: n} + - {type: standard, distro: gentoo, monolithic: n, systemd: y, direct_initrc: n} + - {type: standard, distro: gentoo, monolithic: n, systemd: n, direct_initrc: n} + - {type: mcs, distro: gentoo, monolithic: y, systemd: y, direct_initrc: n} + - {type: mcs, distro: gentoo, monolithic: y, systemd: n, direct_initrc: n} + - {type: mcs, distro: gentoo, monolithic: n, systemd: y, direct_initrc: n} + - {type: mcs, distro: gentoo, monolithic: n, systemd: n, direct_initrc: n} + - {type: mls, distro: gentoo, monolithic: y, systemd: y, direct_initrc: n} + - {type: mls, distro: gentoo, monolithic: y, systemd: n, direct_initrc: n} + - {type: mls, distro: gentoo, monolithic: n, systemd: y, direct_initrc: n} + - {type: mls, distro: gentoo, monolithic: n, systemd: n, direct_initrc: n} + - {type: standard, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined, direct_initrc: n} + - {type: standard, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined, direct_initrc: n} + - {type: mcs, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined, direct_initrc: n} + - {type: mcs, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined, direct_initrc: n} + - {type: mls, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined, direct_initrc: n} + - {type: mls, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined, direct_initrc: n} + - {type: standard, distro: gentoo, monolithic: y, systemd: y, direct_initrc: y} + - {type: standard, distro: gentoo, monolithic: y, systemd: n, direct_initrc: y} + - {type: standard, distro: gentoo, monolithic: n, systemd: y, direct_initrc: y} + - {type: standard, distro: gentoo, monolithic: n, systemd: n, direct_initrc: y} + - {type: mcs, distro: gentoo, monolithic: y, systemd: y, direct_initrc: y} + - {type: mcs, distro: gentoo, monolithic: y, systemd: n, direct_initrc: y} + - {type: mcs, distro: gentoo, monolithic: n, systemd: y, direct_initrc: y} + - {type: mcs, distro: gentoo, monolithic: n, systemd: n, direct_initrc: y} + - {type: mls, distro: gentoo, monolithic: y, systemd: y, direct_initrc: y} + - {type: mls, distro: gentoo, monolithic: y, systemd: n, direct_initrc: y} + - {type: mls, distro: gentoo, monolithic: n, systemd: y, direct_initrc: y} + - {type: mls, distro: gentoo, monolithic: n, systemd: n, direct_initrc: y} + - {type: standard, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined, direct_initrc: y} + - {type: standard, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined, direct_initrc: y} + - {type: mcs, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined, direct_initrc: y} + - {type: mcs, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined, direct_initrc: y} + - {type: mls, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined, direct_initrc: y} + - {type: mls, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined, direct_initrc: y} steps: - uses: actions/checkout@v3 @@ -115,6 +133,7 @@ jobs: echo "MONOLITHIC=${{matrix.build-opts.monolithic}}" >> $GITHUB_ENV echo "SYSTEMD=${{matrix.build-opts.systemd}}" >> $GITHUB_ENV echo "APPS_OFF=${{matrix.build-opts.apps-off}}" >> $GITHUB_ENV + echo "DIRECT_INITRC=${{matrix.build-opts.direct_initrc}}" >> $GITHUB_ENV echo "WERROR=y" >> $GITHUB_ENV - name: Build toolchain @@ -123,6 +142,7 @@ jobs: git clone https://github.com/SELinuxProject/selinux.git ${TEST_TOOLCHAIN_SRC} -b ${SELINUX_USERSPACE_VERSION} # Drop secilc to break xmlto dependence (secilc isn't used here anyway) sed -i -e 's/secilc//' ${TEST_TOOLCHAIN_SRC}/Makefile + echo "DIRECT_INITRC=${{matrix.build-opts.direct_initrc}}" >> $GITHUB_ENV # Drop sepolicy to break setools dependence (sepolicy isn't used anyway) sed -i -e 's/sepolicy//' ${TEST_TOOLCHAIN_SRC}/policycoreutils/Makefile # Drop restorecond to break glib dependence @@ -135,7 +155,7 @@ jobs: - name: Build refpolicy run: | # Drop build.conf settings to listen to env vars - sed -r -i -e '/(MONOLITHIC|TYPE|DISTRO|SYSTEMD|WERROR)/d' build.conf + sed -r -i -e '/(MONOLITHIC|TYPE|DISTRO|SYSTEMD|DIRECT_INITRC|WERROR)/d' build.conf make bare make conf