Skip to content

Commit 503ceeb

Browse files
committed
chg: dev: re-enable fedora build using openscap checkout
* needs git installed before oscap checkout with submodules? * also needs pcre and not pcre2 devel package Signed-off-by: Stephen L Arnold <[email protected]>
1 parent 3eb9196 commit 503ceeb

File tree

1 file changed

+42
-23
lines changed

1 file changed

+42
-23
lines changed

.github/workflows/build.yaml

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,29 +38,46 @@ jobs:
3838
make -j4
3939
popd
4040
41-
#build-fedora:
42-
#name: Build on Fedora Latest (Container)
43-
#runs-on: ubuntu-latest
44-
#container:
45-
#image: fedora:latest
46-
#steps:
47-
#- name: Checkout
48-
#uses: actions/checkout@v4
49-
50-
#- name: Install Deps
51-
#run: dnf install -y wget cmake gcc-c++ openssh-clients util-linux openscap-devel qt5-qtbase-devel qt5-qtxmlpatterns-devel openssh-askpass asciidoc polkit-libs
52-
53-
##- name: Install Openscap
54-
##run: |
55-
##wget https://kojipkgs.fedoraproject.org//packages/openscap/1.3.10/1.fc41/x86_64/openscap-devel-1.3.10-1.fc41.x86_64.rpm
56-
##dnf install openscap-devel-1.3.10-1.fc41.x86_64.rpm
57-
#- name: Build
58-
#run: |
59-
#mkdir -p build
60-
#pushd build
61-
#cmake ..
62-
#make -j4
63-
#popd
41+
build-fedora:
42+
name: Build on Fedora Latest (Container)
43+
runs-on: ubuntu-latest
44+
permissions:
45+
contents: read
46+
container:
47+
image: fedora:latest
48+
49+
steps:
50+
- name: Checkout
51+
uses: actions/checkout@v4
52+
53+
- name: Install Deps
54+
run: |
55+
dnf install -y git cmake gcc-c++ openssh-clients util-linux qt5-qtbase-devel qt5-qtxmlpatterns-devel openssh-askpass asciidoc polkit-libs
56+
dnf install -y procps-ng dbus-devel libacl-devel libblkid-devel libcap-devel libcurl-devel libgcrypt-devel libselinux-devel libxml2-devel libxslt-devel libattr-devel make openldap-devel pcre-devel perl-XML-Parser perl-XML-XPath perl-devel python3-devel python3-dbusmock rpm-devel swig bzip2-devel gcc-c++ libyaml-devel xmlsec1-devel xmlsec1-openssl-devel hostname bzip2 lua rpm-build which strace python3-pytest
57+
58+
- name: Checkout openscap
59+
uses: actions/checkout@v4
60+
with:
61+
repository: VCTLabs/openscap
62+
path: openscap
63+
ref: devel-1.3
64+
submodules: recursive
65+
66+
- name: Build OpenSCAP
67+
run: |
68+
pushd openscap/build
69+
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ../
70+
make -j4
71+
sudo make install
72+
popd
73+
74+
- name: Build
75+
run: |
76+
mkdir -p build
77+
pushd build
78+
cmake ..
79+
make -j4
80+
popd
6481
6582
build-macos:
6683
name: Build on MacOS X Latest
@@ -77,6 +94,7 @@ jobs:
7794
repository: VCTLabs/openscap
7895
path: openscap
7996
ref: devel-1.3
97+
submodules: recursive
8098

8199
- name: Checkout scap-security-guide
82100
uses: actions/checkout@v4
@@ -108,6 +126,7 @@ jobs:
108126
make -j4
109127
sudo make install
110128
popd
129+
111130
- name: Build OSX Image
112131
run: |
113132
REPOSITORY="ComplianceAsCode/content"

0 commit comments

Comments
 (0)