Skip to content

Commit 24fb452

Browse files
jw3jw3
authored
Merge branch 'master' into 1026-add_313_ci
2 parents b719fc9 + 0bd8162 commit 24fb452

27 files changed

+272
-162
lines changed

‎.github/rpm-matrix.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
{
22
"props": [
3+
{
4+
"platform": "fedora",
5+
"dist": "fc42",
6+
"spec": "fapolicy-analyzer.spec",
7+
"image": "registry.fedoraproject.org/fedora:42",
8+
"chroot": "fedora-rawhide-x86_64",
9+
"version": "42",
10+
"prerelease": true
11+
},
312
{
413
"platform": "fedora",
514
"dist": "fc41",
615
"spec": "fapolicy-analyzer.spec",
716
"image": "registry.fedoraproject.org/fedora:41",
8-
"chroot": "fedora-rawhide-x86_64",
17+
"chroot": "fedora-41-x86_64",
918
"version": "41",
1019
"prerelease": true
1120
},

‎.github/workflows/common.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: License header check
1616
runs-on: ubuntu-20.04
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Check for required headers
2020
run: |
2121
! grep -R -L --exclude-dir=vendor \

‎.github/workflows/coverity.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
coverity:
1010
runs-on: ubuntu-20.04
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
- uses: vapier/coverity-scan-action@v1
1414
with:
1515
command: --no-command --fs-capture-search fapolicy_analyzer

‎.github/workflows/pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
working-directory: doc/site
6060

6161
- name: Upload artifact
62-
uses: actions/upload-pages-artifact@v2
62+
uses: actions/upload-pages-artifact@v3
6363
with:
6464
path: ./doc/site/public
6565

‎.github/workflows/pdf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
sudo apt update
1515
sudo apt install git pandoc texlive-latex-recommended texlive-latex-extra
1616
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
ref: ${{ github.ref }}
2020
fetch-depth: 0

‎.github/workflows/python.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
ruff:
1515
runs-on: ubuntu-20.04
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- uses: chartboost/ruff-action@v1
1919
with:
2020
src: fapolicy_analyzer
@@ -26,7 +26,7 @@ jobs:
2626
matrix:
2727
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030
- name: Install requirements
3131
run: |
3232
sudo apt-get update

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
sudo apt update
1616
sudo apt install -y git
1717
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
with:
2020
ref: ${{ github.ref }}
2121
fetch-depth: 0

‎.github/workflows/rpm.yml

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
matrix: ${{ steps.set-matrix.outputs.matrix }}
2222
is-copr-enabled: ${{ steps.is-copr-enabled.outputs.defined }}
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
with:
2626
ref: ${{ github.ref }}
2727

@@ -45,7 +45,7 @@ jobs:
4545
- name: Install deps
4646
run: dnf install -y git make python3
4747

48-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4
4949
with:
5050
ref: ${{ github.ref }}
5151
fetch-depth: 0
@@ -83,7 +83,7 @@ jobs:
8383
mv fapolicy-analyzer-${spec_version}.tar.gz fapolicy-analyzer-${patched_version}.tar.gz
8484
8585
- name: Upload
86-
uses: actions/upload-artifact@v3
86+
uses: actions/upload-artifact@v4
8787
with:
8888
name: source0
8989
path: |
@@ -102,15 +102,13 @@ jobs:
102102
run: |
103103
dnf install -y git dnf5-plugins dnf-plugins-core cargo2rpm
104104
105-
- uses: actions/checkout@v3
105+
- uses: actions/checkout@v4
106106
with:
107107
ref: ${{ github.ref }}
108108
fetch-depth: 0
109109

110110
- name: Adjust spec
111111
run: |
112-
# disable dev-tools crate
113-
sed -i '/tools/d' Cargo.toml
114112
# generate build deps with cargo2rpm
115113
cargo2rpm -p Cargo.toml buildrequires | while read line; do
116114
grep -n "BuildRequires:" fapolicy-analyzer.spec | head -n1 | cut -d: -f1 | xargs -I{} sed -i "{}iBuildRequires: $line" fapolicy-analyzer.spec
@@ -126,7 +124,7 @@ jobs:
126124
scripts/srpm/vendor-rs.sh
127125
128126
- name: Upload tarball
129-
uses: actions/upload-artifact@v3
127+
uses: actions/upload-artifact@v4
130128
with:
131129
name: crates0
132130
path: |
@@ -152,7 +150,7 @@ jobs:
152150
- name: Install Git
153151
run: dnf install -y git
154152

155-
- uses: actions/checkout@v3
153+
- uses: actions/checkout@v4
156154
with:
157155
ref: ${{ github.ref }}
158156
fetch-depth: 0
@@ -214,14 +212,14 @@ jobs:
214212
make -f .copr/Makefile dnf OS_ID=${{ matrix.props.platform }}
215213
216214
- name: Fetch Source0 tarball
217-
uses: actions/download-artifact@v3
215+
uses: actions/download-artifact@v4
218216
with:
219217
name: source0
220218
path: /tmp/rpmbuild/SOURCES/
221219

222220
- name: Fetch Crates0 tarball
223221
if: startsWith(matrix.props.dist, 'el')
224-
uses: actions/download-artifact@v3
222+
uses: actions/download-artifact@v4
225223
with:
226224
name: crates0
227225
path: /tmp/rpmbuild/SOURCES/
@@ -259,16 +257,16 @@ jobs:
259257
mv /tmp/rpmbuild/SOURCES/vendor-rs-${version}.tar.gz /tmp/archives/
260258
261259
- name: Upload Tarballs
262-
uses: actions/upload-artifact@v3
260+
uses: actions/upload-artifact@v4
263261
with:
264-
name: tarball-artifacts
262+
name: tarball-artifacts-${{ matrix.props.dist }}
265263
path: |
266264
/tmp/archives/*.tar.gz
267265
268266
- name: Upload SRPMs
269-
uses: actions/upload-artifact@v3
267+
uses: actions/upload-artifact@v4
270268
with:
271-
name: srpm-artifacts
269+
name: srpm-artifacts-${{ matrix.props.dist }}
272270
path: |
273271
/tmp/archives/*.src.rpm
274272
@@ -291,9 +289,9 @@ jobs:
291289
dnf install -y copr-cli
292290
293291
- name: Download srpm artifacts
294-
uses: actions/download-artifact@v3
292+
uses: actions/download-artifact@v4
295293
with:
296-
name: srpm-artifacts
294+
name: srpm-artifacts-${{ matrix.props.dist }}
297295
path: /tmp/
298296

299297
- name: Checksum artifacts
@@ -325,21 +323,21 @@ jobs:
325323
strategy:
326324
matrix: ${{ fromJson(needs.config.outputs.matrix )}}
327325
steps:
328-
- uses: actions/checkout@v3
326+
- uses: actions/checkout@v4
329327
with:
330328
ref: ${{ github.ref }}
331329

332330
- name: Download srpm artifacts
333-
uses: actions/download-artifact@v3
331+
uses: actions/download-artifact@v4
334332
with:
335-
name: srpm-artifacts
333+
name: srpm-artifacts-${{ matrix.props.dist }}
336334
path: /tmp/src/
337335

338336
- name: Download tarball artifacts
339337
if: startsWith(matrix.props.dist, 'el')
340-
uses: actions/download-artifact@v3
338+
uses: actions/download-artifact@v4
341339
with:
342-
name: tarball-artifacts
340+
name: tarball-artifacts-${{ matrix.props.dist }}
343341
path: /tmp/src/
344342

345343
- name: Checksum artifacts
@@ -382,9 +380,9 @@ jobs:
382380
ls | grep -v -e debug -e log | xargs mv -t /tmp/archives
383381
384382
- name: Upload RPMs
385-
uses: actions/upload-artifact@v3
383+
uses: actions/upload-artifact@v4
386384
with:
387-
name: rpm-artifacts
385+
name: rpm-artifacts-${{ matrix.props.dist }}
388386
path: |
389387
/tmp/archives/*.x86_64.rpm
390388
@@ -397,14 +395,14 @@ jobs:
397395
matrix: ${{ fromJson(needs.config.outputs.matrix )}}
398396
continue-on-error: ${{ matrix.props.prerelease }}
399397
steps:
400-
- uses: actions/checkout@v3
398+
- uses: actions/checkout@v4
401399
with:
402400
ref: ${{ github.ref }}
403401

404402
- name: Download rpm artifacts
405-
uses: actions/download-artifact@v3
403+
uses: actions/download-artifact@v4
406404
with:
407-
name: rpm-artifacts
405+
name: rpm-artifacts-${{ matrix.props.dist }}
408406
path: /tmp/src/
409407

410408
- name: Checksum artifacts
@@ -431,12 +429,12 @@ jobs:
431429
if: startsWith(github.ref, 'refs/tags/v')
432430
runs-on: ubuntu-20.04
433431
steps:
434-
- uses: actions/checkout@v3
432+
- uses: actions/checkout@v4
435433
with:
436434
ref: ${{ github.ref }}
437435

438436
- name: Download artifacts
439-
uses: actions/download-artifact@v3
437+
uses: actions/download-artifact@v4
440438
with:
441439
path: /tmp/archives/
442440

‎.github/workflows/rust.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Rustfmt
1616
runs-on: ubuntu-20.04
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- uses: dtolnay/rust-toolchain@v1
2020
with:
2121
components: rustfmt
@@ -32,7 +32,7 @@ jobs:
3232
name: Check
3333
runs-on: ubuntu-20.04
3434
steps:
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3636
- name: Install package dependencies
3737
run: |
3838
sudo apt-get update
@@ -48,7 +48,7 @@ jobs:
4848
name: Clippy
4949
runs-on: ubuntu-20.04
5050
steps:
51-
- uses: actions/checkout@v3
51+
- uses: actions/checkout@v4
5252

5353
- name: Install package dependencies
5454
run: |
@@ -101,7 +101,7 @@ jobs:
101101
name: Test Suite
102102
runs-on: ubuntu-20.04
103103
steps:
104-
- uses: actions/checkout@v3
104+
- uses: actions/checkout@v4
105105
- name: Install package dependencies
106106
run: |
107107
sudo apt-get update

‎.github/workflows/tools.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
build:
1717
name: Build
1818
runs-on: ubuntu-20.04
19-
# 28 has glibc-2.27, compatible >= el8, fc, ubuntu 18.04
20-
container: fedora:28
19+
# 29 has glibc-2.28, compatible >= el8, fc, ubuntu 20.04
20+
container: fedora:29
2121
steps:
2222
- name: Install build deps
2323
run: |
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
toolchain: 1.71.1
3131

32-
- uses: actions/checkout@v3
32+
- uses: actions/checkout@v4
3333
with:
3434
ref: ${{ github.ref }}
3535
fetch-depth: 0
@@ -44,11 +44,10 @@ jobs:
4444
run: |
4545
mkdir /tmp/tools
4646
mv target/release/tdb /tmp/tools/tdb
47-
mv target/release/rulec /tmp/tools/rulec
4847
mv target/release/faprofiler /tmp/tools/faprofiler
4948
5049
- name: Archive Tools
51-
uses: actions/upload-artifact@v3
50+
uses: actions/upload-artifact@v4
5251
with:
5352
name: fapolicy-analyzer-tools
5453
path: /tmp/tools/*

‎CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,23 @@ Release notes
88

99
<!-- towncrier release notes start -->
1010

11+
## [v1.4.0](https://github.com/ctc-oss/fapolicy-analyzer/releases/tag/v1.4.0) - 2024-07-28
12+
13+
14+
### Added
15+
16+
- Added fapolicyd package filter config parser and analyzer. ([#1012](https://github.com/ctc-oss/fapolicy-analyzer/pull/1012))
17+
- Added fapolicyd package filter config editor GUI. ([#1014](https://github.com/ctc-oss/fapolicy-analyzer/pull/1014))
18+
19+
### Fixed
20+
21+
- Address new Py 3.13 eval() parameter list while still supporting RHEL9 Py 3.9 ([#1022](https://github.com/ctc-oss/fapolicy-analyzer/pull/1022))
22+
23+
### Packaging
24+
25+
- Supporting Fedora 41, 40, 39, dropped support for 38. ([#1016](https://github.com/ctc-oss/fapolicy-analyzer/pull/1016))
26+
27+
1128
## [v1.3.0](https://github.com/ctc-oss/fapolicy-analyzer/releases/tag/v1.3.0) - 2024-02-11
1229

1330

‎Cargo.lock

Lines changed: 0 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)