diff options
| author | Maxime Coste <mawww@kakoune.org> | 2019-12-16 08:54:16 +1100 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2019-12-16 08:54:16 +1100 |
| commit | f8ab9e07804d243b09610b4e8bf7e1edbc5c52c3 (patch) | |
| tree | ca9ced841fc4773ba1b754a995d2457fe58dfcbe | |
| parent | b09653ccc50c8e83dbd7a789e4a264cbceb4be6d (diff) | |
| parent | 4104c8db1e0ec92749f8b64e8826ad52ded00b6b (diff) | |
Merge remote-tracking branch 'lenormf/cirrus'
| -rw-r--r-- | .cirrus.yml | 21 | ||||
| -rw-r--r-- | README.asciidoc | 2 |
2 files changed, 15 insertions, 8 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index e9e3d142..9f4e73c8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,29 +4,33 @@ 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: CXX: g++ - test_script: gmake test + test_script: gmake -j4 test env: 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 - test_script: make test + container: + image: gcc:7 + test_script: make -j4 test env: LC_ALL: en_US.UTF-8 @@ -38,4 +42,7 @@ macos_task: env: CXX: clang++ - name: macos_gcc - test_script: make test + gcc_script: brew install gcc@7 + env: + CXX: g++-7 + test_script: make -j4 test 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 |