Skip to content

Commit dcfee1f

Browse files
committed
Update luerl to fix compilation error (dependency of nkservice)
Override minimum_otp_vsn for worker_pool (We still use Erlang 26/25 on CI
1 parent c5735e9 commit dcfee1f

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

rebar.config

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,10 @@
119119
{jwerl, "1.2.0"},
120120
{cpool, "0.1.0"}, %% Do not upgrade cpool to version 0.1.1, it has bugs
121121
{nkpacket, {git, "https://github.com/esl/nkpacket.git", {branch, "mongooseim-ranch-compatibility"}}},
122-
{nksip, {git, "https://github.com/arcusfelis/nksip.git", {branch, "mu-fix-dialyzer"}}}
122+
{nksip, {git, "https://github.com/arcusfelis/nksip.git", {branch, "mu-fix-dialyzer"}}},
123+
124+
%% knservice pulls lua. We cannot override it, because it is listed in nkservice.app file
125+
{luerl, "1.2.0"}
123126
]}.
124127

125128
{relx, [{release, { mongooseim, {cmd, "cat VERSION | tr -d '\r\n'"} },

rebar.lock

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,7 @@
6666
{<<"lager">>,{pkg,<<"lager">>,<<"3.9.2">>},0},
6767
{<<"lasse">>,{pkg,<<"lasse">>,<<"1.2.0">>},0},
6868
{<<"lhttpc">>,{pkg,<<"lhttpc">>,<<"1.6.2">>},1},
69-
{<<"luerl">>,
70-
{git,"https://github.com/rvirding/luerl.git",
71-
{ref,"5e61c1838d08430af67fb870995b05a41d64aeee"}},
72-
2},
69+
{<<"luerl">>,{pkg,<<"luerl">>,<<"1.2.0">>},0},
7370
{<<"lz4">>,
7471
{git,"https://github.com/szktty/erlang-lz4.git",
7572
{ref,"e7ccf4fc9a806982055f26772522c3543c89d1b5"}},
@@ -168,6 +165,7 @@
168165
{<<"lager">>, <<"4CAB289120EB24964E3886BD22323CB5FEFE4510C076992A23AD18CF85413D8C">>},
169166
{<<"lasse">>, <<"DB8F06983B235F6C4C86AC79BCF23EDDCA16FCCCAD1EB45F222852BB133BD793">>},
170167
{<<"lhttpc">>, <<"044F16F0018C7AA7E945E9E9406C7F6035E0B8BC08BF77B00C78CE260E1071E3">>},
168+
{<<"luerl">>, <<"60F05F4240F0E7C148DDB79B67B8FF972734AAD237AA74C83D0748B8214C8EF0">>},
171169
{<<"meck">>, <<"85CCBAB053F1DB86C7CA240E9FC718170EE5BDA03810A6292B5306BF31BAE5F5">>},
172170
{<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>},
173171
{<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>},
@@ -233,6 +231,7 @@
233231
{<<"lager">>, <<"7F904D9E87A8CB7E66156ED31768D1C8E26EBA1D54F4BC85B1AA4AC1F6340C28">>},
234232
{<<"lasse">>, <<"8081769683F73D76A718319A593F8551A0D3747404C51CCE5869CFC6AEDC7EDF">>},
235233
{<<"lhttpc">>, <<"76B5FA6149D1E10D4B1FBC4EBD51D371DB19C1AB9F0A9ECF5B526440DF064E97">>},
234+
{<<"luerl">>, <<"9CAFD4F6094FF0F5A9D278FD81D60D3E026C820BDFB6CACD4B1BD909F21B525D">>},
236235
{<<"meck">>, <<"81344F561357DC40A8344AFA53767C32669153355B626EA9FCBC8DA6B3045826">>},
237236
{<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>},
238237
{<<"mimerl">>, <<"F278585650AA581986264638EBF698F8BB19DF297F66AD91B18910DFC6E19323">>},

0 commit comments

Comments
 (0)