Merge branch 'master' into cff-retain-gids
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ca73f81..8394cbf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -63,7 +63,7 @@
- image: base/devel
steps:
- checkout
- - run: pacman --noconfirm -Syu freetype2 cairo icu gettext gobject-introspection gcc gcc-libs glib2 graphite pkg-config ragel python python-pip
+ - run: pacman --noconfirm -Syu freetype2 cairo icu gettext gobject-introspection gcc gcc-libs glib2 graphite pkg-config ragel python python-pip make
- run: pip install flake8 fonttools
- run: flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
# C??FLAGS are not needed for a regular build
@@ -71,6 +71,15 @@
- run: make -j32 CPPFLAGS="-Werror"
- run: make check CPPFLAGS="-Werror" || .ci/fail.sh
+ ## Doesn't play well with CircleCI apparently
+ #void-notest:
+ # docker:
+ # - image: voidlinux/voidlinux
+ # steps:
+ # - checkout
+ # - run: xbps-install -Suy freetype gettext gcc glib graphite pkg-config ragel libtool autoconf automake make
+ # - run: ./autogen.sh && make -j32 && make check
+
clang-O3-O0:
docker:
- image: multiarch/crossbuild
@@ -307,6 +316,7 @@
# autotools based builds
- alpine-O3-NOMMAP
- archlinux-py3-all
+ #- void-notest
- gcc-valgrind
- clang-O3-O0
- clang-everything
