valitydev/riak_test
14
0
Fork 0
mirror of https://github.com/valitydev/riak_test.git synced 2024-11-06 00:25:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update rebar and allow deps to be locked

Browse Source
This commit is contained in:
Brett Hazen 2016-10-17 14:27:17 -06:00
parent 61c96b5d78
commit c45621ab9c
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -1,3 +1,5 @@
HEAD_REVISION ?= $(shell git describe --tags --exact-match HEAD 2>/dev/null)
.PHONY: deps .PHONY: deps
APPS = kernel stdlib sasl erts ssl tools os_mon runtime_tools crypto inets \ APPS = kernel stdlib sasl erts ssl tools os_mon runtime_tools crypto inets \
@ -10,6 +12,7 @@ all: deps compile
SMOKE_TEST=1 ./rebar skip_deps=true escriptize SMOKE_TEST=1 ./rebar skip_deps=true escriptize
deps: deps:
$(if $(HEAD_REVISION),$(warning "Warning: you have checked out a tag ($(HEAD_REVISION)) and should use the locked-deps target"))
./rebar get-deps ./rebar get-deps
docsclean: docsclean:
@ -28,6 +31,19 @@ quickbuild:
./rebar skip_deps=true compile ./rebar skip_deps=true compile
./rebar escriptize ./rebar escriptize
##
## Lock Targets
##
## see https://github.com/seth/rebar_lock_deps_plugin
lock: deps compile
./rebar lock-deps
locked-all: locked-deps compile
locked-deps:
@echo "Using rebar.config.lock file to fetch dependencies"
./rebar -C rebar.config.lock get-deps
################## ##################
# Dialyzer targets # Dialyzer targets
################## ##################

BIN
rebar vendored
View File

Binary file not shown.

5
rebar.config
View File

@ -18,13 +18,14 @@
{riakc, ".*", {git, "git://github.com/basho/riak-erlang-client", {branch, "develop-2.2"}}}, {riakc, ".*", {git, "git://github.com/basho/riak-erlang-client", {branch, "develop-2.2"}}},
{riakhttpc, ".*", {git, "git://github.com/basho/riak-erlang-http-client", {branch, "develop-2.2"}}}, {riakhttpc, ".*", {git, "git://github.com/basho/riak-erlang-http-client", {branch, "develop-2.2"}}},
{kvc, "1.3.0", {git, "https://github.com/etrepum/kvc", {tag, "v1.3.0"}}}, {kvc, "1.3.0", {git, "https://github.com/etrepum/kvc", {tag, "v1.3.0"}}},
{druuid, ".*", {git, "git://github.com/kellymclaughlin/druuid.git", {tag, "0.2"}}} {druuid, ".*", {git, "git://github.com/kellymclaughlin/druuid.git", {tag, "0.2"}}},
{rebar_lock_deps_plugin, ".*", {git, "https://github.com/basho/rebar_lock_deps_plugin.git", {tag, "3.1.0p1"}}}
]}. ]}.
{escript_incl_apps, [goldrush, lager, getopt, riakhttpc, riakc, ibrowse, mochiweb, kvc]}. {escript_incl_apps, [goldrush, lager, getopt, riakhttpc, riakc, ibrowse, mochiweb, kvc]}.
{escript_emu_args, "%%! -escript main riak_test_escript +K true +P 10000 -env ERL_MAX_PORTS 10000\n"}. {escript_emu_args, "%%! -escript main riak_test_escript +K true +P 10000 -env ERL_MAX_PORTS 10000\n"}.
{plugin_dir, "src"}. {plugin_dir, "src"}.
{plugins, [rebar_riak_test_plugin]}. {plugins, [rebar_riak_test_plugin, rebar_lock_deps_plugin]}.
{riak_test, [ {riak_test, [
{test_paths, ["tests", "perf"]}, {test_paths, ["tests", "perf"]},
{test_output, "ebin"} {test_output, "ebin"}

2
tools.mk
View File

@ -122,7 +122,7 @@ dialyzer-run:
| grep -F -f dialyzer.ignore-warnings.tmp -v \ | grep -F -f dialyzer.ignore-warnings.tmp -v \
| sed -E 's/^[[:space:]]*[0-9]+[[:space:]]*//' \ | sed -E 's/^[[:space:]]*[0-9]+[[:space:]]*//' \
| sed -E 's/([]\^:+?|()*.$${}\[])/\\\1/g' \ | sed -E 's/([]\^:+?|()*.$${}\[])/\\\1/g' \
| sed -E 's/(\\\.erl\\\:)/\1\\d+:/g' \ | sed -E 's/(\\\.erl\\\:)/\1[[:digit:]]+:/g' \
| sed -E 's/^(.*)$$/^[[:space:]]*\1$$/g' \ | sed -E 's/^(.*)$$/^[[:space:]]*\1$$/g' \
> dialyzer_unhandled_warnings ; \ > dialyzer_unhandled_warnings ; \
rm dialyzer.ignore-warnings.tmp; \ rm dialyzer.ignore-warnings.tmp; \