Skip to content

Commit d1110e9

Browse files
authored
Merge pull request #371 from elixirscript/makefile
Use make file to couple elixir and js commands
2 parents 8703a53 + 9781b9d commit d1110e9

File tree

3 files changed

+41
-14
lines changed

3 files changed

+41
-14
lines changed

.travis.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@ install:
99
- npm install -g yarn
1010
- yarn
1111
before_script:
12-
- wget https://repo.hex.pm/builds/elixir/v1.5.0-otp-20.zip
13-
- unzip -d elixir v1.5.0-otp-20.zip
12+
- wget https://repo.hex.pm/builds/elixir/v1.5.1-otp-20.zip
13+
- unzip -d elixir v1.5.1-otp-20.zip
1414
- export PATH=$(pwd)/elixir/bin:${PATH}
1515
- mix local.rebar --force
1616
- mix local.hex --force
1717
- mix deps.get
1818
script:
19-
- yarn build
20-
- mix test
21-
- yarn test
22-
- yarn test-app
19+
- make
20+
- make test
2321
notifications:
2422
webhooks:
2523
urls:

Makefile

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
.PHONY: compile test clean js_compile elixir_compile elixir_test js_test app_test deps elixir_deps js_deps
2+
3+
default: compile
4+
5+
compile: js_compile elixir_compile
6+
7+
js_compile:
8+
yarn build
9+
10+
elixir_compile:
11+
mix compile
12+
13+
test: elixir_test js_test app_test
14+
15+
js_test:
16+
yarn test
17+
18+
elixir_test:
19+
mix test --cover
20+
21+
app_test:
22+
yarn test-app
23+
24+
clean:
25+
rm -rf priv/build
26+
mix clean
27+
28+
deps: elixir_deps js_deps
29+
30+
elixir_deps:
31+
mix deps.get
32+
33+
js_deps:
34+
yarn

README.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,13 @@ Development
5858
git clone [email protected]:bryanjos/elixirscript.git
5959

6060
#Get dependencies
61-
mix deps.get
62-
yarn
63-
64-
# Create ElixirScript.Core.js
65-
yarn build
61+
make deps
6662

6763
# Compile
68-
mix compile
64+
make
6965

7066
# Test
71-
mix test
72-
yarn test
67+
make test
7368
```
7469

7570
Communication

0 commit comments

Comments
 (0)