From 295bc955dbafc140118c11fba192a7906bc8d393 Mon Sep 17 00:00:00 2001 From: soranoba Date: Mon, 17 May 2021 23:02:03 +0900 Subject: [PATCH] Support OTP24 --- .circleci/config.yml | 40 ++++++++++++++++++++++++++++++---------- Makefile | 1 + doc/bbmustache.md | 6 +++--- rebar.config | 3 ++- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a4d28e..5d23528 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,6 +5,8 @@ jobs: parameters: version: type: string + commands: + type: string docker: - image: circleci/erlang:<< parameters.version >> auth: @@ -12,19 +14,37 @@ jobs: password: $DOCKERHUB_PASSWORD steps: - checkout - - run: rm -rf _build; make + - run: rm -rf _build; make << parameters.commands >> workflows: version: 2 general: jobs: - test: - matrix: - parameters: - version: - - "23.3" - - "22.3" - - "21.3" - - "20.3" - - "19.3" - - "18.3" + name: "test-24" + version: "24" + commands: "ci edoc" + - test: + name: "test-23.3" + version: "23.3" + commands: "ci edoc" + - test: + name: "test-22.3" + version: "22.3" + commands: "ci edoc" + - test: + name: "test-21.3" + version: "21.3" + commands: "ci edoc" + - test: + name: "test-20.3" + version: "20.3" + commands: "ci" + - test: + name: "test-19.3" + version: "19.3" + commands: "ci" + - test: + name: "test-18.3" + version: "18.3" + commands: "ci" diff --git a/Makefile b/Makefile index 87564e6..fe3b5a1 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ CWD=$(shell pwd) .PHONY: ct all: compile escriptize eunit ct xref dialyze edoc +ci: compile escriptize eunit ct xref dialyze compile: @./rebar3 as dev compile diff --git a/doc/bbmustache.md b/doc/bbmustache.md index c4599aa..c80b7d5 100644 --- a/doc/bbmustache.md +++ b/doc/bbmustache.md @@ -136,7 +136,7 @@ __abstract datatype__: `template()` ## Function Index ## -
compile/2Equivalent to compile(Template, Data, []).
compile/3Embed the data in the template.
default_partial_file_reader/2Default partial file reader.
default_value_serializer/1Default value serializer for templtated values.
parse_binary/1Equivalent to parse_binary(Bin, []).
parse_binary/2Create a template/0 from a binary.
parse_file/1Equivalent to parse_file(Filename, []).
parse_file/2Create a template/0 from a file.
render/2Equivalent to render(Bin, Data, []).
render/3Equivalent to compile(parse_binary(Bin), Data, Options).
+
compile/2Equivalent to compile(Template, Data, []).
compile/3Embed the data in the template.
default_partial_file_reader/2Default partial file reader.
default_value_serializer/1Default value serializer for templtated values.
parse_binary/1Equivalent to parse_binary(Bin, []).
parse_binary/2Create a template/0 from a binary.
parse_file/1Equivalent to parse_file(Filename, []).
parse_file/2Create a template/0 from a file.
render/2Equivalent to render(Bin, Data, []).
render/3Equivalent to compile(parse_binary(Bin), Data, Options).
@@ -223,7 +223,7 @@ Create a [`template/0`](#template-0) from a binary. ### parse_file/1 ### 

-parse_file(Filename::file:filename_all()) -> template()
+parse_file(Filename::file:filename_all()) -> template()

@@ -234,7 +234,7 @@ Equivalent to [`parse_file(Filename, [])`](#parse_file-2). ### parse_file/2 ### 

-parse_file(Filename::file:filename_all(), Options::[parse_option()]) -> template()
+parse_file(Filename::file:filename_all(), Options::[parse_option()]) -> template()

diff --git a/rebar.config b/rebar.config index 102d2c9..7d67e98 100644 --- a/rebar.config +++ b/rebar.config @@ -16,6 +16,7 @@ {edoc_opts, [ {doclet, edown_doclet}, + {app_default, "http://www.erlang.org/doc/man"}, {dialyzer_specs, all}, {report_missing_type, true}, {report_type_mismatch, true}, @@ -52,7 +53,7 @@ ]}, {doc, [{deps, [ - {edown, ".*", {git, "git://github.com/uwiger/edown.git", {branch, "master"}}} + {edown, ".*", {git, "git://github.com/uwiger/edown.git", {tag, "0.8.3"}}} ]} ]}, {bench, [{deps,