From 2585360a3e6a604693e65b9e14f5ed73ea3e3b29 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sun, 24 May 2020 17:05:44 +0000
Subject: [PATCH] Simplify .travis.yml (#719)

---
 .travis.yml | 49 +++++++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3085d7b6..54c148f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,37 +1,34 @@
+language: cpp
+
+services:
+    - docker
+
 git:
     submodules: false
 
-_linux_shared: &linux_shared
-    os: linux
-    sudo: false
-    services:
-        - docker
-    before_install:
-        - docker pull alexays/waybar:${distro}
-        - find . -type f \( -name '*.cpp' -o -name '*.h' \) -print0 | xargs -r0 clang-format -i
-    script:
-        - echo FROM alexays/waybar:${distro} > Dockerfile
-        - echo ADD . /root >> Dockerfile
-        - docker build -t waybar .
-        - docker run waybar /bin/sh -c "cd /root && meson build -Dman-pages=enabled && ninja -C build"
+env:
+    - distro: debian
+    - distro: archlinux
+    - distro: fedora
+    - distro: alpine
+    - distro: opensuse
+
+before_install:
+    - docker pull alexays/waybar:${distro}
+    - find . -type f \( -name '*.cpp' -o -name '*.h' \) -print0 | xargs -r0 clang-format -i
+
+script:
+    - echo FROM alexays/waybar:${distro} > Dockerfile
+    - echo ADD . /root >> Dockerfile
+    - docker build -t waybar .
+    - docker run waybar /bin/sh -c "cd /root && meson build -Dman-pages=enabled && ninja -C build"
 
 jobs:
   include:
-    - <<: *linux_shared
-      env: distro=debian
-    - <<: *linux_shared
-      env: distro=archlinux
-    - <<: *linux_shared
-      env: distro=fedora
-    - <<: *linux_shared
-      env: distro=alpine
-    - <<: *linux_shared
-      env: distro=opensuse
     - os: freebsd
-      language: cpp
       compiler: clang
-      sudo: required
-      install:
+      env:
+      before_install:
         - sudo sed -i '' 's/quarterly/latest/' /etc/pkg/FreeBSD.conf
         - sudo pkg install -y date gtk-layer-shell gtkmm30 jsoncpp libdbusmenu
                libfmt libmpdclient libudev-devd meson pulseaudio scdoc spdlog