Skip to content

Commit

Permalink
Rejuvenate project
Browse files Browse the repository at this point in the history
  • Loading branch information
lpgauth committed Mar 18, 2024
1 parent a2ef36d commit dcc31b8
Show file tree
Hide file tree
Showing 11 changed files with 59 additions and 108 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/erlang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@ jobs:
build:
runs-on: ubuntu-latest
container:
image: lpgauth/erlang-cassandra:0.1.1

image: lpgauth/erlang-scylla:26.2.2-5.2-amd64
steps:
- uses: actions/checkout@v1
- name: Start Cassandra
run: cassandra -R
- name: Start Scylla
run: |
python3 /docker-entrypoint.py&
- name: Set Path
run: |
echo "/usr/local/lib/erlang/bin" >> $GITHUB_PATH
- name: Compile
run: make compile
- name: Elvis rock
run: make elvis
- name: Run xref
run: make xref
- name: Run eunit
Expand Down
63 changes: 26 additions & 37 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,39 +1,28 @@
FROM cassandra:3.11
FROM scylladb/scylla:5.2

ENV OTP_VERSION="24.1.2" \
REBAR3_VERSION="3.17.0"
RUN apt-get update
RUN apt-get -y --no-install-recommends install \
autoconf \
dpkg-dev \
gcc \
g++ \
make \
libncurses-dev \
unixodbc-dev \
libssl-dev \
libsctp-dev \
wget \
ca-certificates \
pax-utils \
git

RUN set -xe \
&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
&& OTP_DOWNLOAD_SHA256="c141a046bb7184a7bb5c3d6da2ed013e465d1fbe4ff5cd16e0fbb7a0e786a152" \
&& deps='dpkg-dev g++ gcc libncurses5-dev libssl-dev git-all' \
&& apt-get update \
&& apt-get install -y --no-install-recommends $deps \
&& curl -fSL -o otp-src.tar.gz "$OTP_DOWNLOAD_URL" \
&& echo "$OTP_DOWNLOAD_SHA256 otp-src.tar.gz" | sha256sum -c - \
&& export ERL_TOP="/usr/src/otp_src_${OTP_VERSION%%@*}" \
&& mkdir -vp $ERL_TOP \
&& tar -xzf otp-src.tar.gz -C $ERL_TOP --strip-components=1 \
&& rm otp-src.tar.gz \
&& ( cd $ERL_TOP \
&& gnuArch="$(dpkg-architecture --query DEB_HOST_GNU_TYPE)" \
&& ./configure --build="$gnuArch" \
&& make -j$(nproc) \
&& make -j$(nproc) docs DOC_TARGETS=chunks \
&& make install install-docs DOC_TARGETS=chunks ) \
&& find /usr/local -name examples | xargs rm -rf

CMD ["erl"]

RUN set -xe \
&& REBAR3_DOWNLOAD_URL="https://github.com/erlang/rebar3/archive/${REBAR3_VERSION}.tar.gz" \
&& REBAR3_DOWNLOAD_SHA256="4c7f33a342bcab498f9bf53cc0ee5b698d9598b8fa9ef6a14bcdf44d21945c27" \
&& mkdir -p /usr/src/rebar3-src \
&& curl -fSL -o rebar3-src.tar.gz "$REBAR3_DOWNLOAD_URL" \
&& echo "$REBAR3_DOWNLOAD_SHA256 rebar3-src.tar.gz" | sha256sum -c - \
&& tar -xzf rebar3-src.tar.gz -C /usr/src/rebar3-src --strip-components=1 \
&& rm rebar3-src.tar.gz \
&& cd /usr/src/rebar3-src \
&& HOME=$PWD ./bootstrap \
&& install -v ./rebar3 /usr/local/bin/ \
&& rm -rf /usr/src/rebar3-src
RUN mkdir -p /OTP/subdir
RUN wget -nv "https://github.com/erlang/otp/archive/OTP-26.2.3.tar.gz" && tar -zxf "OTP-26.2.3.tar.gz" -C /OTP/subdir --strip-components=1
WORKDIR /OTP/subdir
RUN ./otp_build autoconf
RUN ./configure --with-ssl
RUN make -j$(getconf _NPROCESSORS_ONLN)
RUN make -j$(getconf _NPROCESSORS_ONLN) install
RUN find /usr/local -regex '/usr/local/lib/erlang/\(lib/\|erts-\).*/\(man\|obj\|c_src\|emacs\|info\|examples\)' | xargs rm -rf
RUN find /usr/local -name src | xargs -r find | grep -v '\.hrl$' | xargs rm -v || true
RUN find /usr/local -name src | xargs -r find | xargs rmdir -vp || true
3 changes: 1 addition & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015-2017 Louis-Philippe Gauthier
Copyright (c) 2015-2024 Louis-Philippe Gauthier

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

9 changes: 4 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
CACHEGRIND=qcachegrind
ELVIS=./bin/elvis
REBAR3=$(shell which rebar3)
ifeq ($(REBAR3),)
REBAR3=./bin/rebar3
endif

all: compile

Expand All @@ -12,10 +15,6 @@ compile:
@echo "Running rebar3 compile..."
@$(REBAR3) as compile compile

coveralls:
@echo "Running rebar3 coveralls send..."
@$(REBAR3) as test coveralls send

dialyzer:
@echo "Running rebar3 dialyze..."
@$(REBAR3) dialyzer
Expand Down Expand Up @@ -49,4 +48,4 @@ xref:
@echo "Running rebar3 xref..."
@$(REBAR3) xref

.PHONY: clean compile coveralls dialyzer edoc elvis eunit profile xref
.PHONY: clean compile dialyzer edoc eunit profile xref
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# marina
High-Performance Erlang Cassandra CQL Client

[![Build Status](https://travis-ci.org/lpgauth/marina.svg?branch=master)](https://travis-ci.org/lpgauth/marina)
[![Coverage Status](https://coveralls.io/repos/github/lpgauth/marina/badge.svg?branch=master)](https://coveralls.io/github/lpgauth/marina?branch=master)
High-Performance Erlang Cassandra / Scylla CQL Client

### Requirements

Expand Down Expand Up @@ -170,7 +167,7 @@ make xref
```license
The MIT License (MIT)
Copyright (c) 2015-2018 Louis-Philippe Gauthier
Copyright (c) 2015-2024 Louis-Philippe Gauthier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Binary file removed bin/elvis
Binary file not shown.
35 changes: 0 additions & 35 deletions elvis.config

This file was deleted.

8 changes: 5 additions & 3 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@

{deps, [
{foil, ".*",
{git, "https://github.com/lpgauth/foil.git", {tag, "0.1.1"}}},
{git, "https://github.com/lpgauth/foil.git", {tag, "0.1.3"}}},
{granderl, ".*",
{git, "https://github.com/tokenrove/granderl.git", "ee3fac0a2ca1d460c90808537216707f82cc777f"}},
{lz4, ".*",
{git, "https://github.com/lpgauth/erlang-lz4.git", {branch, "rebar3"}}},
{murmur, ".*",
{git, "https://github.com/lpgauth/murmur.git", {tag, "0.1.1"}}},
{git, "https://github.com/lpgauth/murmur.git", {tag, "0.1.3"}}},
{shackle, ".*",
{git, "https://github.com/lpgauth/shackle.git", {tag, "0.6.14"}}}
{git, "https://github.com/lpgauth/shackle.git", {tag, "0.6.19"}}}
]}.

{edoc_opts, [
Expand Down
7 changes: 0 additions & 7 deletions rebar.config.script

This file was deleted.

20 changes: 12 additions & 8 deletions rebar.lock
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
{"1.1.0",
{"1.2.0",
[{<<"foil">>,
{git,"https://github.com/lpgauth/foil.git",
{ref,"56440106cc70f45d53ae461e98a547b5cde63646"}},
{ref,"e462829855a745d8f20fb0508ae3eb8e323b03bd"}},
0},
{<<"granderl">>,
{git,"https://github.com/tokenrove/granderl.git",
{ref,"ee3fac0a2ca1d460c90808537216707f82cc777f"}},
0},
{<<"granderl">>,{pkg,<<"granderl">>,<<"0.1.5">>},1},
{<<"lz4">>,
{git,"https://github.com/lpgauth/erlang-lz4.git",
{ref,"d52a642b9f6a4451a5f4ab7bc718d2fcfcf67f7f"}},
{ref,"30ac242cf8f6ec9ef097f494ae87f6295039ffd4"}},
0},
{<<"metal">>,{pkg,<<"metal">>,<<"0.1.1">>},1},
{<<"murmur">>,
{git,"https://github.com/lpgauth/murmur.git",
{ref,"1ef5b3680c61498aa9f9c99aae6ea021d7844b71"}},
{ref,"db2cd781c895d03561bc967ca75fe95e67a92dcf"}},
0},
{<<"shackle">>,
{git,"https://github.com/lpgauth/shackle.git",
{ref,"a498ef0fde4808fa71fd5fe1404543475aaf7043"}},
{ref,"a4f7d82d10115cf0d676582b638a56260be685d5"}},
0}]}.
[
{pkg_hash,[
{<<"granderl">>, <<"F20077A68BD80B8D8783BD15A052813C6483771DEC1A5B837D307CBE92F14122">>},
{<<"metal">>, <<"5D3D1322DA7BCD34B94FED5486F577973685298883954F7A3E517EF5EF6953F5">>}]}
{<<"metal">>, <<"5D3D1322DA7BCD34B94FED5486F577973685298883954F7A3E517EF5EF6953F5">>}]},
{pkg_hash_ext,[
{<<"metal">>, <<"88B82B634998A1A768DEDCD372C2F7E657B19445325C0AF5CCBAC62C77210F1D">>}]}
].
2 changes: 2 additions & 0 deletions src/marina_pool_server.erl
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
-module(marina_pool_server).
-compile({no_auto_import,[nodes/2]}).

-include("marina_internal.hrl").

-export([
Expand Down

0 comments on commit dcc31b8

Please sign in to comment.