Skip to content

Commit

Permalink
Merge pull request #261 from basho/develop-3.0-292
Browse files Browse the repository at this point in the history
Develop 3.0 292
  • Loading branch information
martinsumner committed May 7, 2020
2 parents 5ca7491 + 7d74d3f commit 3dee1dd
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 22 deletions.
Binary file added .eqc-info
Binary file not shown.
16 changes: 6 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
language: erlang
notifications:
webhooks: http://basho-engbot.herokuapp.com/travis?key=a5be8bf3dea048bd7c5c1e93a37da1ab29709f51
email: eng@basho.com
otp_release:
- R15B02
- R15B01
- R15B
- R14B04
- R14B03
# - R15B03

- 20.3.8
- 21.3
- 22.3
script:
- chmod u+x rebar3
- ./rebar3 do upgrade, compile, xref, dialyzer, eunit
4 changes: 2 additions & 2 deletions c_src/build_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [ `uname -s` = 'SunOS' -a "${POSIX_SHELL}" != "true" ]; then
fi
unset POSIX_SHELL # clear it so if we invoke other scripts, they run as ksh as well

LEVELDB_VSN="2.0.35"
LEVELDB_VSN="2.0.36"

SNAPPY_VSN="1.0.4"

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

;;
esac
esac
11 changes: 1 addition & 10 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{eunit_opts, [verbose]}.
{so_name, "eleveldb.so"}.

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

{provider_hooks,
[
Expand All @@ -22,15 +22,6 @@

{erl_opts, [warnings_as_errors, debug_info]}.

%%
%% The following 3 lines are only activated during builbot
%% unit tests. The buildbot script executes the following:
%% sed -i -e 's/% #!sed //' rebar.config test/eleveldb_schema_tests.erl
%%
% #!sed {deps, [
% #!sed {cuttlefish, ".*", {git, "git://github.com/basho/cuttlefish.git", {branch, "develop"}}}
% #!sed ]}.

{port_env, [
%% Make sure to set -fPIC when compiling leveldb
{"CFLAGS", "$CFLAGS -Wall -O3 -fPIC"},
Expand Down
Binary file modified rebar3
Binary file not shown.

0 comments on commit 3dee1dd

Please sign in to comment.