Skip to content

Commit 3dee1dd

Browse files
authored
Merge pull request #261 from basho/develop-3.0-292
Develop 3.0 292
2 parents 5ca7491 + 7d74d3f commit 3dee1dd

File tree

5 files changed

+9
-22
lines changed

5 files changed

+9
-22
lines changed

.eqc-info

5.74 KB
Binary file not shown.

.travis.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
language: erlang
2-
notifications:
3-
webhooks: http://basho-engbot.herokuapp.com/travis?key=a5be8bf3dea048bd7c5c1e93a37da1ab29709f51
4-
email: eng@basho.com
52
otp_release:
6-
- R15B02
7-
- R15B01
8-
- R15B
9-
- R14B04
10-
- R14B03
11-
# - R15B03
12-
3+
- 20.3.8
4+
- 21.3
5+
- 22.3
6+
script:
7+
- chmod u+x rebar3
8+
- ./rebar3 do upgrade, compile, xref, dialyzer, eunit

c_src/build_deps.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if [ `uname -s` = 'SunOS' -a "${POSIX_SHELL}" != "true" ]; then
88
fi
99
unset POSIX_SHELL # clear it so if we invoke other scripts, they run as ksh as well
1010

11-
LEVELDB_VSN="2.0.35"
11+
LEVELDB_VSN="2.0.36"
1212

1313
SNAPPY_VSN="1.0.4"
1414

@@ -103,4 +103,4 @@ case "$1" in
103103
(cp leveldb/perf_dump leveldb/sst_rewrite leveldb/sst_scan leveldb/leveldb_repair ../priv)
104104

105105
;;
106-
esac
106+
esac

rebar.config

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{eunit_opts, [verbose]}.
33
{so_name, "eleveldb.so"}.
44

5-
{plugins, [{rebar3_eqc, {git, "https://github.com/Vagabond/rebar3-eqc-plugin", {branch, "master"}}}, pc]}.
5+
{plugins, [{eqc_rebar, {git, "https://github.com/Quviq/eqc-rebar", {branch, "master"}}}, pc]}.
66

77
{provider_hooks,
88
[
@@ -22,15 +22,6 @@
2222

2323
{erl_opts, [warnings_as_errors, debug_info]}.
2424

25-
%%
26-
%% The following 3 lines are only activated during builbot
27-
%% unit tests. The buildbot script executes the following:
28-
%% sed -i -e 's/% #!sed //' rebar.config test/eleveldb_schema_tests.erl
29-
%%
30-
% #!sed {deps, [
31-
% #!sed {cuttlefish, ".*", {git, "git://github.com/basho/cuttlefish.git", {branch, "develop"}}}
32-
% #!sed ]}.
33-
3425
{port_env, [
3526
%% Make sure to set -fPIC when compiling leveldb
3627
{"CFLAGS", "$CFLAGS -Wall -O3 -fPIC"},

rebar3

141 KB
Binary file not shown.

0 commit comments

Comments
 (0)