From 77b16a5124efb8ede9c4219ddea7832503ebfddf Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 1 Mar 2019 19:42:40 +0100 Subject: [PATCH] ci: use scdoc-git because 1.9.1 is broken --- .builds/alpine.yml | 6 +++++- .builds/archlinux.yml | 6 +++++- .builds/freebsd.yml | 8 +++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.builds/alpine.yml b/.builds/alpine.yml index 328625a5..07a10db0 100644 --- a/.builds/alpine.yml +++ b/.builds/alpine.yml @@ -12,7 +12,6 @@ packages: - meson - pango-dev - pixman-dev - - scdoc - wayland-dev - wayland-protocols - xcb-util-image-dev @@ -20,7 +19,12 @@ packages: sources: - https://github.com/swaywm/sway - https://github.com/swaywm/wlroots + - https://git.sr.ht/~sircmpwn/scdoc tasks: + - scdoc: | + cd scdoc + make PREFIX=/usr + sudo make install PREFIX=/usr - wlroots: | cd wlroots meson --prefix=/usr build -Drootston=false -Dexamples=false diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml index c8f116e0..a9e3a9ae 100644 --- a/.builds/archlinux.yml +++ b/.builds/archlinux.yml @@ -8,7 +8,6 @@ packages: - libxkbcommon - meson - pango - - scdoc - wayland - wayland-protocols - xcb-util-image @@ -16,7 +15,12 @@ packages: sources: - https://github.com/swaywm/sway - https://github.com/swaywm/wlroots + - https://git.sr.ht/~sircmpwn/scdoc tasks: + - scdoc: | + cd scdoc + make PREFIX=/usr + sudo make install PREFIX=/usr - wlroots: | cd wlroots meson --prefix=/usr build -Drootston=false -Dexamples=false diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index 8fa76025..91a3817d 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -8,7 +8,6 @@ packages: - graphics/gdk-pixbuf2 - graphics/wayland - graphics/wayland-protocols -- textproc/scdoc - x11-toolkits/pango - x11/libxcb - x11/libxkbcommon @@ -22,10 +21,17 @@ packages: - x11/libX11 - x11/pixman - x11/xcb-util-wm +# scdoc dependencies +- devel/gmake sources: - https://github.com/swaywm/sway - https://github.com/swaywm/wlroots +- https://git.sr.ht/~sircmpwn/scdoc tasks: +- scdoc: | + cd scdoc + gmake PREFIX=/usr/local + sudo gmake install PREFIX=/usr/local - fixup_epoll: | cat << 'EOF' | sudo tee /usr/local/libdata/pkgconfig/epoll-shim.pc prefix=/usr/local