Skip to content

Commit

Permalink
Use pre-canned Fedora 40 and Debian unstable CI targets
Browse files Browse the repository at this point in the history
Signed-off-by: Richard Hughes <[email protected]>
  • Loading branch information
hughsie committed Jun 3, 2024
1 parent 72d99e7 commit 2ec52a3
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 17 deletions.
41 changes: 24 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
{
"name": "pull-request",
"on": {
"push": { "branches": "main" },
"pull_request": { "branches": "main" },
},
"jobs": {
"linux": {
"runs-on": "ubuntu-latest",
"container": "vathpela/efi-ci:f36-x64",
"steps": [
{ "uses": "actions/checkout@v2" },
{ "run": "meson build && ninja -C build" },
],
},
},
}
name: Build and Test

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

permissions:
contents: read

jobs:
build-linux:
runs-on: ubuntu-latest
strategy:
matrix:
distro:
- fedora
- debian
fail-fast: false
steps:
- uses: actions/checkout@v4
- run: docker build -t efibootmgr-${{ matrix.distro }} -f ci/Dockerfile-${{ matrix.distro }} .
- run: docker run -t -v `pwd`:/build efibootmgr-${{ matrix.distro }} ./ci/build-${{ matrix.distro }}.sh
4 changes: 4 additions & 0 deletions ci/Dockerfile-debian
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM debian:unstable
RUN apt-get update -qq
RUN apt-get install -yq --no-install-recommends meson ninja-build pkg-config libefivar-dev
WORKDIR /build
3 changes: 3 additions & 0 deletions ci/Dockerfile-fedora
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM fedora:40
RUN dnf -y install meson gcc redhat-rpm-config efivar-devel
WORKDIR /build
1 change: 1 addition & 0 deletions ci/build-debian.sh
10 changes: 10 additions & 0 deletions ci/build-fedora.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh
set -e
export LC_ALL=C.UTF-8
mkdir -p build && cd build
rm -rf *
meson ..
ninja -v || bash
ninja test -v
DESTDIR=/tmp/install-ninja ninja install
cd ..

0 comments on commit 2ec52a3

Please sign in to comment.