diff options
| author | Harry Jeffery <harry@exec64.co.uk> | 2019-07-18 23:17:35 +0100 |
|---|---|---|
| committer | Harry Jeffery <harry@exec64.co.uk> | 2019-07-18 23:22:20 +0100 |
| commit | ed4b4ed7552828f2f5f2889137149e278a3ca771 (patch) | |
| tree | b5133ecefe35d955bb4b60839d00829933d827fc /.builds | |
| parent | 7d72f3065a72ce0e285587d14f026ce1167faab8 (diff) | |
| download | imv-ed4b4ed7552828f2f5f2889137149e278a3ca771.tar.gz | |
Test both X11 and Wayland builds in ci
Diffstat (limited to '.builds')
| -rw-r--r-- | .builds/archlinux.yml | 25 | ||||
| -rw-r--r-- | .builds/debian.yml | 26 | ||||
| -rw-r--r-- | .builds/fedora.yml | 26 | ||||
| -rw-r--r-- | .builds/ubuntu.yml | 26 |
4 files changed, 79 insertions, 24 deletions
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml index 06bb9de..b4a9ed1 100644 --- a/.builds/archlinux.yml +++ b/.builds/archlinux.yml @@ -7,6 +7,7 @@ packages: - libpng - librsvg - libtiff + - libx11 - libxkbcommon - pango - wayland @@ -17,11 +18,23 @@ tasks: cd imv sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk cat config.mk - - gcc: | + - gcc-x11: | cd imv - CC=gcc BUILDDIR=gcc make - CC=gcc BUILDDIR=gcc make check - - clang: | + sed -i -e 's/WINDOWS=.*/WINDOWS=x11/' config.mk + CC=gcc BUILDDIR=gcc-x11 make + CC=gcc BUILDDIR=gcc-x11 make check + - clang-x11: | cd imv - CC=clang BUILDDIR=clang make - CC=clang BUILDDIR=clang make check + sed -i -e 's/WINDOWS=.*/WINDOWS=x11/' config.mk + CC=clang BUILDDIR=clang-x11 make + CC=clang BUILDDIR=clang-x11 make check + - gcc-wayland: | + cd imv + sed -i -e 's/WINDOWS=.*/WINDOWS=wayland/' config.mk + CC=gcc BUILDDIR=gcc-wayland make + CC=gcc BUILDDIR=gcc-wayland make check + - clang-wayland: | + cd imv + sed -i -e 's/WINDOWS=.*/WINDOWS=wayland/' config.mk + CC=clang BUILDDIR=clang-wayland make + CC=clang BUILDDIR=clang-wayland make check diff --git a/.builds/debian.yml b/.builds/debian.yml index 8a5b7e7..1819ded 100644 --- a/.builds/debian.yml +++ b/.builds/debian.yml @@ -4,12 +4,14 @@ packages: - libcmocka-dev - libegl1-mesa-dev - libfreeimage-dev + - libglu-dev - libpango1.0-dev - libpng-dev - librsvg2-dev - libtiff-dev - libturbojpeg-dev - libwayland-dev + - libx11-dev - libxkbcommon-dev - mesa-common-dev sources: @@ -19,11 +21,23 @@ tasks: cd imv sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk cat config.mk - - gcc: | + - gcc-x11: | cd imv - CC=gcc BUILDDIR=gcc make - CC=gcc BUILDDIR=gcc make check - - clang: | + sed -i -e 's/WINDOWS=.*/WINDOWS=x11/' config.mk + CC=gcc BUILDDIR=gcc-x11 make + CC=gcc BUILDDIR=gcc-x11 make check + - clang-x11: | cd imv - CC=clang BUILDDIR=clang make - CC=clang BUILDDIR=clang make check + sed -i -e 's/WINDOWS=.*/WINDOWS=x11/' config.mk + CC=clang BUILDDIR=clang-x11 make + CC=clang BUILDDIR=clang-x11 make check + - gcc-wayland: | + cd imv + sed -i -e 's/WINDOWS=.*/WINDOWS=wayland/' config.mk + CC=gcc BUILDDIR=gcc-wayland make + CC=gcc BUILDDIR=gcc-wayland make check + - clang-wayland: | + cd imv + sed -i -e 's/WINDOWS=.*/WINDOWS=wayland/' config.mk + CC=clang BUILDDIR=clang-wayland make + CC=clang BUILDDIR=clang-wayland make check diff --git a/.builds/fedora.yml b/.builds/fedora.yml index 125406d..5cc9e49 100644 --- a/.builds/fedora.yml +++ b/.builds/fedora.yml @@ -2,6 +2,7 @@ image: fedora/latest packages: - clang - freeimage-devel + - libX11-devel - libcmocka-devel - libpng-devel - librsvg2-devel @@ -9,6 +10,7 @@ packages: - libxkbcommon-devel - mesa-libEGL-devel - mesa-libGL-devel + - mesa-libGLU-devel - pango-devel - turbojpeg-devel - wayland-devel @@ -19,11 +21,23 @@ tasks: cd imv sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk cat config.mk - - gcc: | + - gcc-x11: | cd imv - CC=gcc BUILDDIR=gcc make - CC=gcc BUILDDIR=gcc make check - - clang: | + sed -i -e 's/WINDOWS=.*/WINDOWS=x11/' config.mk + CC=gcc BUILDDIR=gcc-x11 make + CC=gcc BUILDDIR=gcc-x11 make check + - clang-x11: | cd imv - CC=clang BUILDDIR=clang make - CC=clang BUILDDIR=clang make check + sed -i -e 's/WINDOWS=.*/WINDOWS=x11/' config.mk + CC=clang BUILDDIR=clang-x11 make + CC=clang BUILDDIR=clang-x11 make check + - gcc-wayland: | + cd imv + sed -i -e 's/WINDOWS=.*/WINDOWS=wayland/' config.mk + CC=gcc BUILDDIR=gcc-wayland make + CC=gcc BUILDDIR=gcc-wayland make check + - clang-wayland: | + cd imv + sed -i -e 's/WINDOWS=.*/WINDOWS=wayland/' config.mk + CC=clang BUILDDIR=clang-wayland make + CC=clang BUILDDIR=clang-wayland make check diff --git a/.builds/ubuntu.yml b/.builds/ubuntu.yml index b032464..c648a65 100644 --- a/.builds/ubuntu.yml +++ b/.builds/ubuntu.yml @@ -4,12 +4,14 @@ packages: - libcmocka-dev - libegl1-mesa-dev - libfreeimage-dev + - libglu-dev - libpango1.0-dev - libpng-dev - librsvg2-dev - libtiff-dev - libturbojpeg-dev - libwayland-dev + - libx11-dev - libxkbcommon-dev - mesa-common-dev sources: @@ -19,11 +21,23 @@ tasks: cd imv sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk cat config.mk - - gcc: | + - gcc-x11: | cd imv - CC=gcc BUILDDIR=gcc make - CC=gcc BUILDDIR=gcc make check - - clang: | + sed -i -e 's/WINDOWS=.*/WINDOWS=x11/' config.mk + CC=gcc BUILDDIR=gcc-x11 make + CC=gcc BUILDDIR=gcc-x11 make check + - clang-x11: | cd imv - CC=clang BUILDDIR=clang make - CC=clang BUILDDIR=clang make check + sed -i -e 's/WINDOWS=.*/WINDOWS=x11/' config.mk + CC=clang BUILDDIR=clang-x11 make + CC=clang BUILDDIR=clang-x11 make check + - gcc-wayland: | + cd imv + sed -i -e 's/WINDOWS=.*/WINDOWS=wayland/' config.mk + CC=gcc BUILDDIR=gcc-wayland make + CC=gcc BUILDDIR=gcc-wayland make check + - clang-wayland: | + cd imv + sed -i -e 's/WINDOWS=.*/WINDOWS=wayland/' config.mk + CC=clang BUILDDIR=clang-wayland make + CC=clang BUILDDIR=clang-wayland make check |