You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2019/02/05 18:30:15 UTC
[couchdb] branch import-smoosh updated: Force mix rebar/hex/deps
get on make elixir (#1894)
This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch import-smoosh
in repository https://gitbox.apache.org/repos/asf/couchdb.git
The following commit(s) were added to refs/heads/import-smoosh by this push:
new d0ec540 Force mix rebar/hex/deps get on make elixir (#1894)
new af6fa3c Merge branch 'master' into import-smoosh
d0ec540 is described below
commit d0ec5408a8d6ab33d925271f21b8dc45dfb5cdc1
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Tue Feb 5 13:28:05 2019 -0500
Force mix rebar/hex/deps get on make elixir (#1894)
---
Makefile | 8 ++++++--
Makefile.win | 12 ++++++++----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 3947699..76e77a8 100644
--- a/Makefile
+++ b/Makefile
@@ -208,9 +208,13 @@ python-black-update: .venv/bin/black
. dev/run rel/overlay/bin/couchup test/javascript/run
.PHONY: elixir
-elixir: elixir-check-formatted elixir-credo devclean
+elixir: elixir-init elixir-check-formatted elixir-credo devclean
@dev/run -a adm:pass --no-eval 'test/elixir/run --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
+.PHONY: elixir-init
+elixir-init:
+ @cd test/elixir && mix local.rebar --force && mix local.hex --force && mix deps.get
+
.PHONY: elixir-cluster-without-quorum
elixir-cluster-without-quorum: elixir-check-formatted elixir-credo devclean
@dev/run -n 3 -q -a adm:pass \
@@ -231,7 +235,7 @@ elixir-check-formatted:
# We use it in our tests
.PHONY: elixir-credo
elixir-credo:
- @cd test/elixir/ && mix deps.get && mix credo
+ @cd test/elixir/ && mix credo
.PHONY: javascript
# target: javascript - Run JavaScript test suites or specific ones defined by suites option
diff --git a/Makefile.win b/Makefile.win
index fd1ab9b..7b7f805 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -172,20 +172,24 @@ python-black-update: .venv/bin/black
. dev\run rel\overlay\bin\couchup test\javascript\run
.PHONY: elixir
-elixir: elixir-check-formatted elixir-credo devclean
+elixir: elixir-init elixir-check-formatted elixir-credo devclean
@dev\run -a adm:pass --no-eval 'test\elixir\run.cmd --exclude without_quorum_test --exclude with_quorum_test $(EXUNIT_OPTS)'
+.PHONY: elixir-init
+elixir-init:
+ @cd test/elixir && mix local.rebar --force && mix local.hex --force && mix deps.get
+
.PHONY: elixir-cluster-without-quorum
elixir-cluster-without-quorum: elixir-check-formatted elixir-credo devclean
@dev\run -n 3 -q -a adm:pass \
--degrade-cluster 2 \
- --no-eval 'test\elixir\run --only without_quorum_test $(EXUNIT_OPTS)'
+ --no-eval 'test\elixir\run.cmd --only without_quorum_test $(EXUNIT_OPTS)'
.PHONY: elixir-cluster-with-quorum
elixir-cluster-with-quorum: elixir-check-formatted elixir-credo devclean
@dev\run -n 3 -q -a adm:pass \
--degrade-cluster 1 \
- --no-eval 'test\elixir\run --only with_quorum_test $(EXUNIT_OPTS)'
+ --no-eval 'test\elixir\run.cmd --only with_quorum_test $(EXUNIT_OPTS)'
.PHONY: elixir-check-formatted
elixir-check-formatted:
@@ -195,7 +199,7 @@ elixir-check-formatted:
# We use it in our tests
.PHONY: elixir-credo
elixir-credo:
- @cd test/elixir/ && mix deps.get && mix credo
+ @cd test/elixir/ && mix credo
.PHONY: test-cluster-with-quorum
test-cluster-with-quorum: devclean