From 1b2bd2c9774016c6b83df42cb218367455ab0b79 Mon Sep 17 00:00:00 2001
From: Frank LENORMAND <lenormf@gmail.com>
Date: Sun, 15 Dec 2019 09:19:02 +0100
Subject: [PATCH 1/3] cirrus: Fix the URL of the build badge

---
 README.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.asciidoc b/README.asciidoc
index 05a172da..53597e9b 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -4,7 +4,7 @@ ifdef::env-github,env-browser[:outfilesuffix: .asciidoc]
 :website: http://kakoune.org
 :travis-img: https://travis-ci.org/mawww/kakoune.svg?branch=master
 :travis-url: https://travis-ci.org/mawww/kakoune
-:cirrus-img: https://cirrus-ci.com/github/mawww/kakoune.svg
+:cirrus-img: https://api.cirrus-ci.com/github/mawww/kakoune.svg
 :cirrus-url: https://cirrus-ci.com/github/mawww/kakoune
 :irc-img: https://img.shields.io/badge/IRC-%23kakoune-blue.svg
 :irc-url: https://webchat.freenode.net/?channels=kakoune

From 4cf53bc429424dcb897fb910a4fca8f8387878d0 Mon Sep 17 00:00:00 2001
From: Frank LENORMAND <lenormf@gmail.com>
Date: Sun, 15 Dec 2019 09:25:36 +0100
Subject: [PATCH 2/3] cirrus: Target specific compiler versions

Installing a specific version of Clang on Mac OS/FreeBSD seems
complicated, therefore the current C.I. builds will keep using whatever
version is already available in the image.
---
 .cirrus.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index e9e3d142..aaaa60d4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,6 +4,8 @@ freebsd_task:
     gmake_script: pkg install -y gmake
     matrix:
         - name: freebsd_clang
+          env:
+              CXX: clang++
         - name: freebsd_gcc
           gcc_script: pkg install -y gcc
           env:
@@ -13,19 +15,21 @@ freebsd_task:
         LC_ALL: en_US.UTF-8
 
 linux_task:
-    container:
-        image: gcc:7
     locales_script:
         - apt-get update && apt-get -y install locales
         - echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
         - locale-gen en_US.UTF-8
     matrix:
         - name: linux_clang
+          container:
+              image: silkeh/clang:5
+          clang_script:
+              - apt-get -y install pkg-config libncursesw5-dev
           env:
               CXX: clang++
-          clang_script:
-              - apt-get -y install clang
         - name: linux_gcc
+          container:
+              image: gcc:7
     test_script: make test
     env:
         LC_ALL: en_US.UTF-8
@@ -38,4 +42,7 @@ macos_task:
           env:
               CXX: clang++
         - name: macos_gcc
+          gcc_script: brew install gcc@7
+          env:
+              CXX: g++-7
     test_script: make test

From 4104c8db1e0ec92749f8b64e8826ad52ded00b6b Mon Sep 17 00:00:00 2001
From: Frank LENORMAND <lenormf@gmail.com>
Date: Sun, 15 Dec 2019 10:52:05 +0100
Subject: [PATCH 3/3] cirrus: Build in parallel

---
 .cirrus.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index aaaa60d4..9f4e73c8 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -10,7 +10,7 @@ freebsd_task:
           gcc_script: pkg install -y gcc
           env:
               CXX: g++
-    test_script: gmake test
+    test_script: gmake -j4 test
     env:
         LC_ALL: en_US.UTF-8
 
@@ -30,7 +30,7 @@ linux_task:
         - name: linux_gcc
           container:
               image: gcc:7
-    test_script: make test
+    test_script: make -j4 test
     env:
         LC_ALL: en_US.UTF-8
 
@@ -45,4 +45,4 @@ macos_task:
           gcc_script: brew install gcc@7
           env:
               CXX: g++-7
-    test_script: make test
+    test_script: make -j4 test