Skip to content

Commit 855f37a

Browse files
committed
Use pre-canned Fedora 40 and Debian unstable CI targets
1 parent 72d99e7 commit 855f37a

File tree

5 files changed

+41
-17
lines changed

5 files changed

+41
-17
lines changed

.github/workflows/ci.yml

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1-
{
2-
"name": "pull-request",
3-
"on": {
4-
"push": { "branches": "main" },
5-
"pull_request": { "branches": "main" },
6-
},
7-
"jobs": {
8-
"linux": {
9-
"runs-on": "ubuntu-latest",
10-
"container": "vathpela/efi-ci:f36-x64",
11-
"steps": [
12-
{ "uses": "actions/checkout@v2" },
13-
{ "run": "meson build && ninja -C build" },
14-
],
15-
},
16-
},
17-
}
1+
name: Build and Test
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
build-linux:
14+
runs-on: ubuntu-latest
15+
strategy:
16+
matrix:
17+
distro:
18+
- fedora
19+
- debian
20+
fail-fast: false
21+
steps:
22+
- uses: actions/checkout@v4
23+
- run: docker build -t passim-${{ matrix.distro }} -f ci/Dockerfile-${{ matrix.distro }} .
24+
- run: docker run -t -v `pwd`:/build passim-${{ matrix.distro }} ./ci/build-${{ matrix.distro }}.sh

ci/Dockerfile-debian

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM debian:unstable
2+
RUN apt-get install -yq --no-install-recommends meson ninja-build pkg-config efivar-dev
3+
WORKDIR /build

ci/Dockerfile-fedora

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM fedora:40
2+
RUN dnf -y install meson redhat-rpm-config efivar-devel
3+
WORKDIR /build

ci/build-debian.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build-fedora.sh

ci/build-fedora.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/sh
2+
set -e
3+
export LC_ALL=C.UTF-8
4+
mkdir -p build && cd build
5+
rm -rf *
6+
meson ..
7+
ninja -v || bash
8+
ninja test -v
9+
DESTDIR=/tmp/install-ninja ninja install
10+
cd ..

0 commit comments

Comments
 (0)