Skip to content

Commit 22ad0c8

Browse files
authored
Fix build for Fedora 40 and 42
1 parent 79cf7dd commit 22ad0c8

File tree

3 files changed

+27
-1
lines changed

3 files changed

+27
-1
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// See https://aka.ms/devcontainer.json for format details.
2+
{
3+
"name": "fedora-42",
4+
"image": "fedora:42",
5+
"onCreateCommand": ".devcontainer/onCreate-meson.sh || true",
6+
"features": {
7+
"ghcr.io/devcontainers/features/git": {},
8+
"ghcr.io/devcontainers/features/python:1": {},
9+
"../uv": {
10+
"version": "latest"
11+
}
12+
},
13+
"customizations": {
14+
"vscode": {
15+
"extensions": [
16+
"ms-python.python"
17+
]
18+
}
19+
}
20+
}

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111

1212
jobs:
1313
build:
14+
name: Build and Test
1415
runs-on: ubuntu-latest
1516
strategy:
1617
fail-fast: false
@@ -41,6 +42,11 @@ jobs:
4142
4243
- name: Install dependencies
4344
run: |
45+
# Install dnf5
46+
if [ "${{ matrix.container }}" = "fedora:40" ] && ! rpm -q dnf5 >/dev/null; then
47+
rpm-ostree install dnf5 dnf5-plugins
48+
fi
49+
4450
SYSTEM=$(build/bin/sage-guess-package-system)
4551
if [ "$SYSTEM" = "fedora" ]; then
4652
# Need to use --setopt=tsflags="" to avoid errors with gphelp

src/sage/graphs/graph_decompositions/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ else
55
tdlib = disabler()
66
endif
77
# Cannot be found via pkg-config
8-
rw = cc.find_library('rw')
8+
rw = cc.find_library('rw', required: false, disabler: true)
99

1010
py.install_sources(
1111
'__init__.py',

0 commit comments

Comments
 (0)