Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: update for wlroots 0.15.0

Browse Source
This commit is contained in:
Isaac Freund 2021-12-21 04:02:17 +00:00
parent c34d850397
commit 2288778dd7
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
.github/workflows/ci_build.yml vendored
View File

@ -1,6 +1,3 @@
# Build river and run the test suite every time a commit is pushed to master or
# a pull request is opened against master.
on: on:
push: push:
branches: branches:
@ -9,7 +6,7 @@ on:
branches: branches:
- master - master
name: voidlinux name: voidlinux glibc
jobs: jobs:
default_build: default_build:
@ -22,18 +19,26 @@ jobs:
run: | run: |
xbps-install -Sy xbps xbps-install -Sy xbps
xbps-install -uy xbps-install -uy
# wlroots dependencies as well as we build from source # wayland/wlroots dependencies as well as we build from source
xbps-install -y MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel \ xbps-install -y MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel \
libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols \ libinput-devel libxkbcommon-devel pixman-devel expat-devel libxml2-devel \
xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel libxcb-devel \ libffi-devel wayland-protocols xcb-util-errors-devel xcb-util-wm-devel \
xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \ xcb-util-renderutil-devel libxcb-devel xcb-util-cursor-devel xcb-util-devel \
xcb-util-xrm-devel xorg-server-xwayland pkg-config meson git gcc \ xcb-util-image-devel xcb-util-keysyms-devel xcb-util-xrm-devel \
zig pkgconf scdoc xorg-server-xwayland pkg-config meson git gcc zig pkgconf scdoc
git clone https://github.com/swaywm/wlroots.git git clone https://gitlab.freedesktop.org/wayland/wayland.git
cd wayland
git checkout 1.20.0
meson build -Ddocumentation=false -Dtests=false --prefix /usr
ninja -C build install
cd ..
git clone https://gitlab.freedesktop.org/wlroots/wlroots.git
cd wlroots cd wlroots
git checkout 0.14.0 git checkout 0.15.0
meson build --auto-features=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false meson build --auto-features=enabled -Drenderers=gles2 -Dexamples=false \
-Dwerror=false -Db_ndebug=false --prefix /usr
ninja -C build install ninja -C build install
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -58,18 +63,26 @@ jobs:
run: | run: |
xbps-install -Sy xbps xbps-install -Sy xbps
xbps-install -uy xbps-install -uy
# wlroots dependencies as well as we build from source # wayland/wlroots dependencies as well as we build from source
xbps-install -y MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel \ xbps-install -y MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel \
libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols \ libinput-devel libxkbcommon-devel pixman-devel expat-devel libxml2-devel \
xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel libxcb-devel \ libffi-devel wayland-protocols xcb-util-errors-devel xcb-util-wm-devel \
xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \ xcb-util-renderutil-devel libxcb-devel xcb-util-cursor-devel xcb-util-devel \
xcb-util-xrm-devel xorg-server-xwayland pkg-config meson git gcc \ xcb-util-image-devel xcb-util-keysyms-devel xcb-util-xrm-devel \
zig pkgconf scdoc xorg-server-xwayland pkg-config meson git gcc zig pkgconf scdoc
git clone https://github.com/swaywm/wlroots.git git clone https://gitlab.freedesktop.org/wayland/wayland.git
cd wayland
git checkout 1.20.0
meson build -Ddocumentation=false -Dtests=false --prefix /usr
ninja -C build install
cd ..
git clone https://gitlab.freedesktop.org/wlroots/wlroots.git
cd wlroots cd wlroots
git checkout 0.14.0 git checkout 0.15.0
meson build --auto-features=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false meson build --auto-features=enabled -Drenderers=gles2 -Dexamples=false \
-Dwerror=false -Db_ndebug=false --prefix /usr
ninja -C build install ninja -C build install
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -92,8 +105,7 @@ jobs:
steps: steps:
- name: install deps - name: install deps
run: | run: |
xbps-install -S xbps-install -Sy xbps
xbps-install -uy xbps
xbps-install -uy zig git xbps-install -uy zig git
- name: checkout - name: checkout
@ -106,5 +118,4 @@ jobs:
zig fmt --check river/ zig fmt --check river/
zig fmt --check riverctl/ zig fmt --check riverctl/
zig fmt --check rivertile/ zig fmt --check rivertile/
zig fmt --check example/
zig fmt --check build.zig zig fmt --check build.zig

2
deps/zig-wlroots vendored

@ -1 +1 @@
Subproject commit 9e2fc0dd6dfbd47c56fe10e260255e13cc5f114d Subproject commit a813d6c1c7b88dea0ba3b0eb28fe92206ad82ea6