From 146b4260cf52c0653eea8490e0b47f87974a2a20 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Fri, 7 Aug 2020 23:32:22 +0100
Subject: Switch from Travis to Github actions (#480)

---
 .github/workflows/haskell.yml | 15 ++++++++-------
 .travis.yml                   | 29 -----------------------------
 readme.md                     |  1 -
 3 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index ace7cac..d91c1db 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -1,4 +1,4 @@
-name: Haskell CI
+name: Haskell CI (PRs)
 
 on:
   push:
@@ -14,10 +14,10 @@ jobs:
     strategy:
       matrix:
         cabal: ["3.2"]
-        ghc: ["8.4", "8.6.5", "8.8.3", "8.10.1"]
+        ghc: ["8.4", "8.6", "8.8.3", "8.10"]
     env:
       CONFIG: "--enable-tests --enable-benchmarks -fall_extensions"
-  
+
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-haskell@v1
@@ -38,10 +38,11 @@ jobs:
           ${{ runner.os }}-
 
     - name: Install packages
-      run: | 
+      run: |
+        sudo apt-get install -y xorg-dev
         sudo apt-get install -y libasound2-dev libxpm-dev libmpd-dev libxrandr-dev
-        sudo apt-get install -y happy c2hs hspec-discover      
-        
+        sudo apt-get install -y happy c2hs hspec-discover
+
     - name: Install dependencies
       run: |
         cabal update
@@ -49,7 +50,7 @@ jobs:
 
     - name: Build
       run: cabal build $CONFIG
-      
+
     - name: Run hlint
       run: |
         wget https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 39b46fc..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-language: haskell
-
-os: linux
-dist: bionic
-
-addons:
-  apt:
-    update: true
-    sources:
-      - hvr-ghc
-    packages: cabal-install-3.0
-
-ghc:
-  - 8.8.3
-
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y  libiw-dev libasound2-dev libxpm-dev libmpd-dev
-  - sudo apt-get install -y libxrandr-dev
-  - sudo apt-get install -y happy c2hs
-  - export PATH=/opt/ghc/bin:$PATH
-
-install:
-  - travis_wait 30 cabal install --only-dependencies --enable-tests -fall_extensions
-  - wget https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh
-
-script:
-  - sh ./travis.sh src
-  - cabal configure --enable-tests -fall_extensions && cabal build && cabal test
diff --git a/readme.md b/readme.md
index a14a456..cc640af 100644
--- a/readme.md
+++ b/readme.md
@@ -1,5 +1,4 @@
 [![Hackage](https://img.shields.io/hackage/v/xmobar.svg)](http://hackage.haskell.org/package/xmobar)
-[![Build Status](https://travis-ci.org/jaor/xmobar.svg?branch=master)](https://travis-ci.org/jaor/xmobar)
 
 <!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
 **Table of Contents**
-- 
cgit v1.2.3