From 372374382a127f11996c0383a023f077675c9158 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 16 Nov 2018 12:35:55 +0100 Subject: [PATCH] travis: move parts of our build matrix to only run on the daily travis cron job We need to keep our builds running for every push to a minimum. Various distro builds as well as the release-ready build can happily run once a day. This commit also switches from a build matrix to a simple list of build jobs to allow the usage of build type = cron condition (not possible with the matrix builds) Differential Revision: https://phab.enlightenment.org/D7293 --- .travis.yml | 75 ++++++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 41 deletions(-) diff --git a/.travis.yml b/.travis.yml index a697a3b113..8ef3386d04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,51 +17,44 @@ env: - EIO_MONITOR_POLL=1 - CC="ccache gcc" - CXX="ccache g++" - matrix: - - - - DISTRO=Ubuntu1804 - - DISTRO=Fedora28 CI_BUILD_TYPE=wayland - - DISTRO=Fedora28 CI_BUILD_TYPE=misc - - DISTRO=Fedora28 CI_BUILD_TYPE=misc-disabled - - DISTRO=Fedora28 CI_BUILD_TYPE=release-ready - - DISTRO=Debian91 - - DISTRO=Archlinux + +jobs: + include: + - env: + - os: linux + - DISTRO=Fedora28 + - CI_BUILD_TYPE=wayland + - env: + - os: linux + - DISTRO=Fedora28 + - CI_BUILD_TYPE=misc + - env: + - os: linux + - DISTRO=Fedora28 + - CI_BUILD_TYPE=misc-disabled + - if: type = cron + env: + - os: linux + - DISTRO=Ubuntu1804 + - if: type = cron + env: + - os: linux + - DISTRO=Fedora28 + - CI_BUILD_TYPE=release-ready + - if: type = cron + env: + - os: linux + - DISTRO=Debian91 + - if: type = cron + env: + - os: linux + - DISTRO=Archlinux + exclude: + - os: linux services: - docker -matrix: - fast_finish: true - exclude: - - os: osx - env: - DISTRO=Ubuntu1804 - - os: osx - env: - DISTRO=Fedora28 - CI_BUILD_TYPE=wayland - - os: osx - env: - DISTRO=Fedora28 - CI_BUILD_TYPE=misc - - os: osx - env: - DISTRO=Fedora28 - CI_BUILD_TYPE=misc-disabled - - os: osx - env: - DISTRO=Fedora28 - CI_BUILD_TYPE=release-ready - - os: osx - env: - DISTRO=Debian91 - - os: osx - env: - DISTRO=Archlinux - - - os: linux - env: - before_install: - | if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then