Skip to content

Commit efc9931

Browse files
committed
ci: attempt to build & install wlroots first, then unity build wayfire
1 parent 88c8eca commit efc9931

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.github/workflows/ci.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ jobs:
1111
- uses: actions/checkout@v1
1212
- run: git config --global --add safe.directory /__w/wayfire/wayfire
1313
- run: git submodule sync --recursive && git submodule update --init --force --recursive
14-
- run: meson build -Dtests=enabled -Db_pch=true
14+
- run: (cd subprojects/wlroots && meson build --prefix=/usr && ninja -C build install)
15+
- run: meson build -Dtests=enabled -Db_pch=true -Duse_system_wlroots=enabled --unity on
1516
- run: ninja -v -Cbuild
1617
- run: ninja -v -Cbuild test
1718
test_glibc_llvm:
@@ -28,7 +29,8 @@ jobs:
2829
- uses: actions/checkout@v1
2930
- run: git config --global --add safe.directory /__w/wayfire/wayfire
3031
- run: git submodule sync --recursive && git submodule update --init --force --recursive
31-
- run: env CC=clang CXX=clang++ CXXFLAGS="-stdlib=libc++" LDFLAGS="-fuse-ld=lld -stdlib=libc++" meson build -Db_pch=true
32+
- run: (cd subprojects/wlroots && env CC=clang CXX=clang++ CXXFLAGS="-stdlib=libc++" LDFLAGS="-fuse-ld=lld -stdlib=libc++" meson build --prefix=/usr && ninja -C build install)
33+
- run: env CC=clang CXX=clang++ CXXFLAGS="-stdlib=libc++" LDFLAGS="-fuse-ld=lld -stdlib=libc++" meson build -Db_pch=true -Duse_system_wlroots=enabled --unity on
3234
- run: ninja -v -Cbuild
3335
- run: ninja -v -Cbuild test
3436
test_code_style:

0 commit comments

Comments
 (0)