Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Kenton Groombridge <concord@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: .github/workflows/
Date: Wed, 02 Nov 2022 14:43:01
Message-Id: 1667398225.6208749672b0f6d06a417680f8f3101069ab0dce.concord@gentoo
1 commit: 6208749672b0f6d06a417680f8f3101069ab0dce
2 Author: Dave Sugar <dsugar100 <AT> gmail <DOT> com>
3 AuthorDate: Sat Oct 8 00:41:22 2022 +0000
4 Commit: Kenton Groombridge <concord <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 2 14:10:25 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=62087496
7
8 Add 'DIRECT_INITRC' config to automated tests
9
10 Signed-off-by: Dave Sugar <dsugar100 <AT> gmail.com>
11 Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org>
12
13 .github/workflows/tests.yml | 58 ++++++++++++++++++++++++++++++---------------
14 1 file changed, 39 insertions(+), 19 deletions(-)
15
16 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
17 index d45ac7f23..c097331c2 100644
18 --- a/.github/workflows/tests.yml
19 +++ b/.github/workflows/tests.yml
20 @@ -63,24 +63,42 @@ jobs:
21
22 matrix:
23 build-opts:
24 - - {type: standard, distro: gentoo, monolithic: y, systemd: y}
25 - - {type: standard, distro: gentoo, monolithic: y, systemd: n}
26 - - {type: standard, distro: gentoo, monolithic: n, systemd: y}
27 - - {type: standard, distro: gentoo, monolithic: n, systemd: n}
28 - - {type: mcs, distro: gentoo, monolithic: y, systemd: y}
29 - - {type: mcs, distro: gentoo, monolithic: y, systemd: n}
30 - - {type: mcs, distro: gentoo, monolithic: n, systemd: y}
31 - - {type: mcs, distro: gentoo, monolithic: n, systemd: n}
32 - - {type: mls, distro: gentoo, monolithic: y, systemd: y}
33 - - {type: mls, distro: gentoo, monolithic: y, systemd: n}
34 - - {type: mls, distro: gentoo, monolithic: n, systemd: y}
35 - - {type: mls, distro: gentoo, monolithic: n, systemd: n}
36 - - {type: standard, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined}
37 - - {type: standard, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined}
38 - - {type: mcs, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined}
39 - - {type: mcs, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined}
40 - - {type: mls, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined}
41 - - {type: mls, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined}
42 + - {type: standard, distro: gentoo, monolithic: y, systemd: y, direct_initrc: n}
43 + - {type: standard, distro: gentoo, monolithic: y, systemd: n, direct_initrc: n}
44 + - {type: standard, distro: gentoo, monolithic: n, systemd: y, direct_initrc: n}
45 + - {type: standard, distro: gentoo, monolithic: n, systemd: n, direct_initrc: n}
46 + - {type: mcs, distro: gentoo, monolithic: y, systemd: y, direct_initrc: n}
47 + - {type: mcs, distro: gentoo, monolithic: y, systemd: n, direct_initrc: n}
48 + - {type: mcs, distro: gentoo, monolithic: n, systemd: y, direct_initrc: n}
49 + - {type: mcs, distro: gentoo, monolithic: n, systemd: n, direct_initrc: n}
50 + - {type: mls, distro: gentoo, monolithic: y, systemd: y, direct_initrc: n}
51 + - {type: mls, distro: gentoo, monolithic: y, systemd: n, direct_initrc: n}
52 + - {type: mls, distro: gentoo, monolithic: n, systemd: y, direct_initrc: n}
53 + - {type: mls, distro: gentoo, monolithic: n, systemd: n, direct_initrc: n}
54 + - {type: standard, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined, direct_initrc: n}
55 + - {type: standard, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined, direct_initrc: n}
56 + - {type: mcs, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined, direct_initrc: n}
57 + - {type: mcs, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined, direct_initrc: n}
58 + - {type: mls, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined, direct_initrc: n}
59 + - {type: mls, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined, direct_initrc: n}
60 + - {type: standard, distro: gentoo, monolithic: y, systemd: y, direct_initrc: y}
61 + - {type: standard, distro: gentoo, monolithic: y, systemd: n, direct_initrc: y}
62 + - {type: standard, distro: gentoo, monolithic: n, systemd: y, direct_initrc: y}
63 + - {type: standard, distro: gentoo, monolithic: n, systemd: n, direct_initrc: y}
64 + - {type: mcs, distro: gentoo, monolithic: y, systemd: y, direct_initrc: y}
65 + - {type: mcs, distro: gentoo, monolithic: y, systemd: n, direct_initrc: y}
66 + - {type: mcs, distro: gentoo, monolithic: n, systemd: y, direct_initrc: y}
67 + - {type: mcs, distro: gentoo, monolithic: n, systemd: n, direct_initrc: y}
68 + - {type: mls, distro: gentoo, monolithic: y, systemd: y, direct_initrc: y}
69 + - {type: mls, distro: gentoo, monolithic: y, systemd: n, direct_initrc: y}
70 + - {type: mls, distro: gentoo, monolithic: n, systemd: y, direct_initrc: y}
71 + - {type: mls, distro: gentoo, monolithic: n, systemd: n, direct_initrc: y}
72 + - {type: standard, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined, direct_initrc: y}
73 + - {type: standard, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined, direct_initrc: y}
74 + - {type: mcs, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined, direct_initrc: y}
75 + - {type: mcs, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined, direct_initrc: y}
76 + - {type: mls, distro: gentoo, monolithic: y, systemd: y, apps-off: unconfined, direct_initrc: y}
77 + - {type: mls, distro: gentoo, monolithic: y, systemd: n, apps-off: unconfined, direct_initrc: y}
78
79 steps:
80 - uses: actions/checkout@v3
81 @@ -115,6 +133,7 @@ jobs:
82 echo "MONOLITHIC=${{matrix.build-opts.monolithic}}" >> $GITHUB_ENV
83 echo "SYSTEMD=${{matrix.build-opts.systemd}}" >> $GITHUB_ENV
84 echo "APPS_OFF=${{matrix.build-opts.apps-off}}" >> $GITHUB_ENV
85 + echo "DIRECT_INITRC=${{matrix.build-opts.direct_initrc}}" >> $GITHUB_ENV
86 echo "WERROR=y" >> $GITHUB_ENV
87
88 - name: Build toolchain
89 @@ -123,6 +142,7 @@ jobs:
90 git clone https://github.com/SELinuxProject/selinux.git ${TEST_TOOLCHAIN_SRC} -b ${SELINUX_USERSPACE_VERSION}
91 # Drop secilc to break xmlto dependence (secilc isn't used here anyway)
92 sed -i -e 's/secilc//' ${TEST_TOOLCHAIN_SRC}/Makefile
93 + echo "DIRECT_INITRC=${{matrix.build-opts.direct_initrc}}" >> $GITHUB_ENV
94 # Drop sepolicy to break setools dependence (sepolicy isn't used anyway)
95 sed -i -e 's/sepolicy//' ${TEST_TOOLCHAIN_SRC}/policycoreutils/Makefile
96 # Drop restorecond to break glib dependence
97 @@ -135,7 +155,7 @@ jobs:
98 - name: Build refpolicy
99 run: |
100 # Drop build.conf settings to listen to env vars
101 - sed -r -i -e '/(MONOLITHIC|TYPE|DISTRO|SYSTEMD|WERROR)/d' build.conf
102 + sed -r -i -e '/(MONOLITHIC|TYPE|DISTRO|SYSTEMD|DIRECT_INITRC|WERROR)/d' build.conf
103
104 make bare
105 make conf
Report Message
Find on MARC Find on Google Groups