Skip to content

Commit e35b9b3

Browse files
authored
Merge pull request #94 from getong/delete_rebar3
Delete rebar3
2 parents 86576b2 + 24724d4 commit e35b9b3

File tree

6 files changed

+20
-15
lines changed

6 files changed

+20
-15
lines changed

.travis.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ otp_release:
55
- 19.3
66
- 18.3
77
install:
8-
- make
8+
- wget https://s3.amazonaws.com/rebar3/rebar3 && chmod u+x rebar3
9+
- REBAR=./rebar3 make
910
- ./rebar3 update
1011
script:
11-
- make eunit
12-
- make ct
13-
- make proper
14-
- make xref
15-
- make dialyzer
16-
- make lint
12+
- REBAR=./rebar3 make eunit
13+
- REBAR=./rebar3 make ct
14+
- REBAR=./rebar3 make proper
15+
- REBAR=./rebar3 make xref
16+
- REBAR=./rebar3 make dialyzer
17+
- REBAR=./rebar3 make lint
1718
notifications:
1819
1920
slack: lasp-lang:hiPRNnbUa3zdGrrXZfGRAF7D

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ PACKAGE ?= types
22
VERSION ?= $(shell git describe --tags)
33
BASE_DIR = $(shell pwd)
44
ERLANG_BIN = $(shell dirname $(shell which erl))
5-
REBAR = $(shell pwd)/rebar3
6-
MAKE = make
5+
REBAR ?= rebar3
6+
MAKE = make
77

88
.PHONY: rel deps test eqc plots
99

rebar.config

+8-1
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,20 @@
1717

1818
{profiles, [
1919
{test, [
20-
{deps, [{proper, {git, "https://github.com/proper-testing/proper", {tag, "v1.3"}}}]}
20+
{deps, [{proper, "1.3.0"}]}
2121
]},
2222
{lint, [
2323
{plugins, [{rebar3_lint, "0.1.10"}]}
2424
]}
2525
]}.
2626

27+
{relx, [{release, {types, "0.0.1"},
28+
[types]},
29+
30+
{extended_start_script, true},
31+
{overlay, [{mkdir, "data"}]}
32+
]}.
33+
2734
{proper_opts, [{numtests, 1000}]}.
2835

2936
{elvis,

rebar3

-691 KB
Binary file not shown.

relx.config

-3
This file was deleted.

tools.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
# wholesale when a new version of tools.mk is released.
2525
# -------------------------------------------------------------------
2626

27-
REBAR = $(shell pwd)/rebar3
28-
REVISION ?= $(shell git rev-parse --short HEAD)
27+
REBAR ?= rebar3
28+
REVISION ?= $(shell git rev-parse --short HEAD)
2929
PROJECT ?= $(shell basename `find src -name "*.app.src"` .app.src)
3030
DEP_DIR ?= "deps"
3131
EBIN_DIR ?= "ebin"

0 commit comments

Comments
 (0)