From be07ec2ee0868931c13c178d727ee56b75699f60 Mon Sep 17 00:00:00 2001 From: Harry Jeffery Date: Mon, 12 Aug 2019 00:35:49 +0100 Subject: Tweak ci jobs --- .builds/archlinux.yml | 24 ++++++------------------ .builds/debian.yml | 24 ++++++------------------ .builds/fedora.yml | 24 ++++++------------------ .builds/freebsd.yml | 1 - .builds/ubuntu.yml | 24 ++++++------------------ 5 files changed, 24 insertions(+), 73 deletions(-) (limited to '.builds') diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml index b4a9ed1..e8eba80 100644 --- a/.builds/archlinux.yml +++ b/.builds/archlinux.yml @@ -18,23 +18,11 @@ tasks: cd imv sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk cat config.mk - - gcc-x11: | + - gcc: | cd imv - sed -i -e 's/WINDOWS=.*/WINDOWS=x11/' config.mk - CC=gcc BUILDDIR=gcc-x11 make - CC=gcc BUILDDIR=gcc-x11 make check - - clang-x11: | + CC=gcc BUILDDIR=gcc make + CC=gcc BUILDDIR=gcc make check + - clang: | cd imv - 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 + CC=clang BUILDDIR=clang make + CC=clang BUILDDIR=clang make check diff --git a/.builds/debian.yml b/.builds/debian.yml index 1819ded..08c583f 100644 --- a/.builds/debian.yml +++ b/.builds/debian.yml @@ -21,23 +21,11 @@ tasks: cd imv sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk cat config.mk - - gcc-x11: | + - gcc: | cd imv - sed -i -e 's/WINDOWS=.*/WINDOWS=x11/' config.mk - CC=gcc BUILDDIR=gcc-x11 make - CC=gcc BUILDDIR=gcc-x11 make check - - clang-x11: | + CC=gcc BUILDDIR=gcc make + CC=gcc BUILDDIR=gcc make check + - clang: | cd imv - 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 + CC=clang BUILDDIR=clang make + CC=clang BUILDDIR=clang make check diff --git a/.builds/fedora.yml b/.builds/fedora.yml index 5cc9e49..b2f8745 100644 --- a/.builds/fedora.yml +++ b/.builds/fedora.yml @@ -21,23 +21,11 @@ tasks: cd imv sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk cat config.mk - - gcc-x11: | + - gcc: | cd imv - sed -i -e 's/WINDOWS=.*/WINDOWS=x11/' config.mk - CC=gcc BUILDDIR=gcc-x11 make - CC=gcc BUILDDIR=gcc-x11 make check - - clang-x11: | + CC=gcc BUILDDIR=gcc make + CC=gcc BUILDDIR=gcc make check + - clang: | cd imv - 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 + CC=clang BUILDDIR=clang make + CC=clang BUILDDIR=clang make check diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index 96057c6..2d2565c 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -18,7 +18,6 @@ tasks: - configure: | cd imv sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk - sed -i -e 's/WINDOWS=wayland/WINDOWS=x11/' config.mk cat config.mk - build: | cd imv diff --git a/.builds/ubuntu.yml b/.builds/ubuntu.yml index c648a65..9e0eb39 100644 --- a/.builds/ubuntu.yml +++ b/.builds/ubuntu.yml @@ -21,23 +21,11 @@ tasks: cd imv sed -i -e 's/BACKEND_\(.*\)=no/BACKEND_\1=yes/' config.mk cat config.mk - - gcc-x11: | + - gcc: | cd imv - sed -i -e 's/WINDOWS=.*/WINDOWS=x11/' config.mk - CC=gcc BUILDDIR=gcc-x11 make - CC=gcc BUILDDIR=gcc-x11 make check - - clang-x11: | + CC=gcc BUILDDIR=gcc make + CC=gcc BUILDDIR=gcc make check + - clang: | cd imv - 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 + CC=clang BUILDDIR=clang make + CC=clang BUILDDIR=clang make check -- cgit v1.2.3