Skip to content

Develop 3.0 292 #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2020
Merged

Develop 3.0 292 #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8acb0ca
Bump leveldb version - 32bit support
martinsumner Apr 9, 2020
7d74d3f
Standardise versions
martinsumner May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .eqc-info
View file
Open in desktop
Binary file not shown.
16 changes: 6 additions & 10 deletions .travis.yml
View file
Open in desktop
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
View file
Open in desktop
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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What was the reason for bumping this up? We've had some odd leveldb stuff occur, so are quite weary of taking any changes, especially considering the code is essentially an basically an untaintained black box.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just the 32-bit build support (as discussed). Will go forward with this, and leave out the ARM64 PR for now


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
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.