From e84e06d8f9b8138da676d0a56facd16a7c8e28c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Fri, 15 Jan 2016 13:48:35 +0100
Subject: Update CI

---
 Makefile   |  3 ++-
 all.sh     | 19 -------------------
 circle.yml |  4 ++--
 erlang.mk  |  4 ++--
 4 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100755 all.sh

diff --git a/Makefile b/Makefile
index 19eccce..80e6877 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,8 @@ PROJECT_REGISTERED = cowboy_clock
 COMPILE_FIRST = cowboy_middleware cowboy_stream cowboy_sub_protocol
 PLT_APPS = public_key ssl
 CT_OPTS += -ct_hooks cowboy_ct_hook [] # -boot start_sasl
-CI_OTP = OTP-18.0.3 OTP-18.1
+
+CI_OTP = OTP-18.0.3 OTP-18.1.5 OTP-18.2.2
 
 # Dependencies.
 
diff --git a/all.sh b/all.sh
deleted file mode 100755
index fa8a6fd..0000000
--- a/all.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-KERL_INSTALL_PATH=~/erlang
-KERL_RELEASES="17.0 17.1.2 17.3"
-
-make build-ct-suites
-
-for rel in $KERL_RELEASES
-do
-	echo
-	echo "    TESTING $rel"
-	echo
-	. $KERL_INSTALL_PATH/$rel/activate
-	cp ~/.kerl/builds/$rel/otp_src_*/lib/ssl/test/erl_make_certs.erl \
-		deps/ct_helper/src/
-	CT_OPTS="-label $rel" make tests
-done
-
-xdg-open logs/all_runs.html
diff --git a/circle.yml b/circle.yml
index 0d4defb..e443341 100644
--- a/circle.yml
+++ b/circle.yml
@@ -13,11 +13,11 @@ dependencies:
     - sudo apt-get install autoconf2.59
     - cd $HOME/bin && ln -s /usr/bin/autoconf2.59 autoconf
     - cd $HOME/bin && ln -s /usr/bin/autoheader2.59 autoheader
-    - make ci-prepare:
+    - MAKEFLAGS="-j 32" make ci-prepare:
         timeout: 3600
 
 test:
   override:
-    - source $HOME/erlang/OTP-18.0.2/activate && make dialyze
+    - source $HOME/erlang/OTP-18.2.2/activate && make dialyze
     - make -k ci:
         timeout: 3600
diff --git a/erlang.mk b/erlang.mk
index a59b6ed..6748ab5 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -16,7 +16,7 @@
 
 ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
 
-ERLANG_MK_VERSION = 2.0.0-pre.2-72-g86ddfb5
+ERLANG_MK_VERSION = 2.0.0-pre.2-73-g87285ad
 
 # Core configuration.
 
@@ -5095,7 +5095,7 @@ $(if $(filter-out -Werror,$1),\
 endef
 
 define compat_erlc_opts_to_list
-	[$(call comma_list,$(foreach o,$(call compat_prepare_erlc_opts,$1),$(call compat_convert_erlc_opts,$o)))]
+[$(call comma_list,$(foreach o,$(call compat_prepare_erlc_opts,$1),$(call compat_convert_erlc_opts,$o)))]
 endef
 
 define compat_rebar_config
-- 
cgit v1.2.3