Skip to content

Commit db91cb1

Browse files
committed
github: update build.yaml to use meson
1 parent 85a7004 commit db91cb1

File tree

1 file changed

+7
-36
lines changed

1 file changed

+7
-36
lines changed

.github/workflows/build.yaml

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,8 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
os:
13-
- ubuntu-22.04
14-
- ubuntu-24.04
13+
- ubuntu-latest
1514
compiler:
16-
# The NetSurf build system can't find LLVM AR (it looks for it
17-
# in /usr/lib instead of /usr/bin:
18-
# `make: /usr/lib/llvm-ar: No such file or directory`).
19-
# So we need to make it explicit for llvm.
2015
- { vendor: gnu, CC: gcc, AR: ar }
2116
- { vendor: llvm, CC: clang, AR: llvm-ar }
2217

@@ -38,39 +33,15 @@ jobs:
3833
gperf
3934
llvm
4035
pkg-config
36+
meson
37+
ninja-build
38+
python3
4139

42-
- name: Get env.sh
43-
run: |
44-
mkdir projects
45-
wget -O projects/env.sh https://raw.githubusercontent.com/netsurf-browser/netsurf/refs/heads/master/docs/env.sh
46-
47-
- name: Build and install project deps
40+
- name: Configure Meson
4841
env:
4942
CC: ${{ matrix.compiler.CC }}
5043
AR: ${{ matrix.compiler.AR }}
51-
TARGET: ${{ github.event.repository.name }}
52-
run: |
53-
export TARGET_WORKSPACE="$(pwd)/projects"
54-
source projects/env.sh
55-
ns-clone -d -s
56-
ns-make-libs install
44+
run: meson setup build -Dtests=true
5745

5846
- name: Build Library
59-
env:
60-
CC: ${{ matrix.compiler.CC }}
61-
AR: ${{ matrix.compiler.AR }}
62-
TARGET: ${{ github.event.repository.name }}
63-
run: |
64-
export TARGET_WORKSPACE="$(pwd)/projects"
65-
source projects/env.sh
66-
make -j"$(nproc)"
67-
68-
- name: Unit Tests
69-
env:
70-
CC: ${{ matrix.compiler.CC }}
71-
AR: ${{ matrix.compiler.AR }}
72-
TARGET: ${{ github.event.repository.name }}
73-
run: |
74-
export TARGET_WORKSPACE="$(pwd)/projects"
75-
source projects/env.sh
76-
make test
47+
run: meson compile -C build

0 commit comments

Comments
 (0)