commit: 6208749672b0f6d06a417680f8f3101069ab0dce
Author: Dave Sugar <dsugar100 <AT> gmail <DOT> com>
AuthorDate: Sat Oct 8 00:41:22 2022 +0000
Commit: Kenton Groombridge <concord <AT> gentoo <DOT> 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 <dsugar100 <AT> gmail.com>
Signed-off-by: Kenton Groombridge <concord <AT> 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
