Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 20 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,34 @@ name: CI
on: [push, pull_request]
jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
erlang:
- otp: "24"
rebar3: "3.20"
- otp: "25"
rebar3: "3.22"
- otp: "26"
rebar3: "3.22"
- otp: "27"
rebar3: "3.24"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Install Erlang/OTP
run: |
OTP_VERSION="24.1.7-1"
UBUNTU_RELEASE="focal"
DEB_NAME="esl-erlang_${OTP_VERSION}~ubuntu~${UBUNTU_RELEASE}_amd64.deb"
echo $DEB_NAME
curl -f https://packages.erlang-solutions.com/erlang/debian/pool/$DEB_NAME -o $DEB_NAME
sudo dpkg --install $DEB_NAME
uses: erlef/setup-beam@v1
with:
otp-version: ${{ matrix.erlang.otp }}
rebar3-version: ${{ matrix.erlang.rebar3 }}

- name: Run tests
run: make

- name: Archive common test results
if: ${{ always() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: CT results
path: _build/test/logs/**
Expand Down
6 changes: 3 additions & 3 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

{deps,
[ {supervisor3, "1.1.12"}
, {epgsql, "4.6.0"}
, {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe", {tag, "0.18.0"}}}
, {epgsql, "4.7.1"}
, {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe", {tag, "1.0.10"}}}
]}.

{dialyzer, [{warnings, [unknown]}]}.

{profiles,
[ {test, [ {deps, [ {proper, "1.3.0"}
[ {test, [ {deps, [ {proper, "1.4.0"}
]}
, {cover_enabled, true}
]}
Expand Down
8 changes: 4 additions & 4 deletions rebar.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{"1.2.0",
[{<<"epgsql">>,{pkg,<<"epgsql">>,<<"4.6.0">>},0},
[{<<"epgsql">>,{pkg,<<"epgsql">>,<<"4.7.1">>},0},
{<<"snabbkaffe">>,
{git,"https://github.com/kafka4beam/snabbkaffe",
{ref,"bbabb87ff624821612879ed9961b661c7df04e4e"}},
{ref,"b59298334ed349556f63405d1353184c63c66534"}},
0},
{<<"supervisor3">>,{pkg,<<"supervisor3">>,<<"1.1.12">>},0}]}.
[
{pkg_hash,[
{<<"epgsql">>, <<"A403534D03811C867E79405BB18D6061A5FCEF92ACF0236A9150AC93748CE143">>},
{<<"epgsql">>, <<"D4E47CAE46C18C8AFA88E34D59A9B4BAE16368D7CE1EB3DA24FA755EB28393EB">>},
{<<"supervisor3">>, <<"2FAB1AF26BB9F8AE07692BB30EF79D5F1940E1587EFF9C14C6C8B04B16B400A8">>}]},
{pkg_hash_ext,[
{<<"epgsql">>, <<"6BE4910A02551F21EAB6F6F27D97B0D4B1DFFC617F1A64C8C95FDD45652FA9E1">>},
{<<"epgsql">>, <<"B6D86B7DC42C8555B1D4E20880E5099D6D6D053148000E188E548F98E4E01836">>},
{<<"supervisor3">>, <<"62BF29F802C8620B7F9609FE5D81212B1AA5A75A7D86876B61CEA73BE58BA2A6">>}]}
].
6 changes: 0 additions & 6 deletions src/system_monitor_pg.erl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
, handle_call/3
, handle_info/2
, handle_cast/2
, format_status/2
, terminate/2

, connect_options/0
Expand Down Expand Up @@ -103,11 +102,6 @@ handle_cast({produce, Type, Events}, #{connection := Conn} = State) ->
end,
{noreply, State}.

format_status(normal, [_PDict, State]) ->
[{data, [{"State", State}]}];
format_status(terminate, [_PDict, State]) ->
State.

terminate(_Reason, #{connection := undefined}) ->
ok;
terminate(_Reason, #{connection := Conn}) ->
Expand Down
Loading