Skip to content

Commit 94c69f7

Browse files
committed
Upgrade dependencies and runtime versions
1 parent 142c0f1 commit 94c69f7

File tree

9 files changed

+56
-52
lines changed

9 files changed

+56
-52
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
name: OTP ${{matrix.otp_vsn}}
1414
strategy:
1515
matrix:
16-
otp_vsn: ['27']
17-
rebar_vsn: ['3.24.0']
16+
otp_vsn: ['28', '27']
17+
rebar_vsn: ['3.25']
1818
runs-on: 'ubuntu-24.04'
1919
steps:
2020
- uses: actions/checkout@v4
@@ -33,8 +33,8 @@ jobs:
3333
name: docker container test with OTP ${{matrix.otp_vsn}}
3434
strategy:
3535
matrix:
36-
otp_vsn: ['27']
37-
rebar_vsn: ['3.24.0']
36+
otp_vsn: ['28', '27']
37+
rebar_vsn: ['3.25']
3838
runs-on: 'ubuntu-24.04'
3939
env:
4040
OTP_RELEASE: ${{ matrix.otp_vsn }}
@@ -57,7 +57,7 @@ jobs:
5757
- integration_test
5858
if: github.ref == 'refs/heads/master'
5959
env:
60-
OTP_RELEASE: 27.1
60+
OTP_RELEASE: 27.3
6161
steps:
6262
- uses: actions/checkout@v4
6363
- name: Set up QEMU

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG otp_vsn=27.1
1+
ARG otp_vsn=27.3
22
FROM erlang:${otp_vsn} AS builder
33
LABEL org.label-schema.name='AMOC Arsenal' \
44
org.label-schema.vendor='Erlang Solutions'

ci/build_and_push_docker_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
set -euo pipefail
66
IFS=$'\n\t'
77

8-
export otp_vsn="${OTP_RELEASE:-27.1}"
8+
export otp_vsn="${OTP_RELEASE:-27.3}"
99
echo "ERLANG/OTP ${otp_vsn}"
1010

1111
docker buildx build --platform linux/amd64,linux/arm64 \

ci/build_docker_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ IFS=$'\n\t'
77

88
# Get current repo version
99
version="$(git rev-parse --short HEAD)"
10-
otp_vsn="${OTP_RELEASE:-27.1}"
10+
otp_vsn="${OTP_RELEASE:-27.3}"
1111
echo "ERLANG/OTP ${otp_vsn}"
1212
echo "AMOC-ARSENAL-XMPP ${version}"
1313

rebar.config

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66

77
{ deps, [
88
{amoc_arsenal, {git, "https://github.com/esl/amoc-arsenal.git", {branch, "main"}}},
9-
{escalus, "4.4.0"},
10-
{exml, "~> 4.0", {pkg, hexml}},
11-
{gun, "2.1.0"},
12-
{fusco, "0.1.1"}
9+
{escalus, "~> 4.4"},
10+
{exml, "~> 4.1", {pkg, hexml}},
11+
{gun, "~> 2.2"},
12+
{fusco, "~> 0.1"}
13+
]}.
14+
15+
{ overrides, [
16+
{override, gun, [{deps, [{cowlib, "~> 2.0"}]}]}
1317
]}.
1418

1519
{ shell, [

rebar.lock

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
11
{"1.2.0",
2-
[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.5">>},3},
3-
{<<"amoc">>,{pkg,<<"amoc">>,<<"3.3.0">>},1},
2+
[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.7">>},3},
3+
{<<"amoc">>,{pkg,<<"amoc">>,<<"4.0.0">>},1},
44
{<<"amoc_arsenal">>,
55
{git,"https://github.com/esl/amoc-arsenal.git",
6-
{ref,"5e2140ff8c11295a45ff8a555444baf7d0ebab27"}},
6+
{ref,"13c7160ee238dea1152da28501f3d21297f62160"}},
77
0},
88
{<<"amoc_rest">>,
99
{git,"https://github.com/esl/amoc_rest.git",
1010
{ref,"d9f642255f48d14a1ff9601500796f5edb4e11e6"}},
1111
1},
1212
{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.12.2">>},1},
1313
{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.12.0">>},2},
14-
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.13.0">>},1},
15-
{<<"escalus">>,{pkg,<<"escalus">>,<<"4.4.0">>},0},
16-
{<<"exml">>,{pkg,<<"hexml">>,<<"4.1.1">>},0},
17-
{<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"1.0.6">>},2},
18-
{<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.6.1">>},1},
14+
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.15.0">>},1},
15+
{<<"escalus">>,{pkg,<<"escalus">>,<<"4.5.1">>},0},
16+
{<<"exml">>,{pkg,<<"hexml">>,<<"4.1.2">>},0},
17+
{<<"fast_pbkdf2">>,{pkg,<<"fast_pbkdf2">>,<<"2.0.0">>},2},
18+
{<<"fast_scram">>,{pkg,<<"fast_scram">>,<<"0.7.0">>},1},
1919
{<<"fusco">>,{pkg,<<"fusco">>,<<"0.1.1">>},0},
20-
{<<"gun">>,{pkg,<<"gun">>,<<"2.1.0">>},0},
20+
{<<"gun">>,{pkg,<<"gun">>,<<"2.2.0">>},0},
2121
{<<"jesse">>,{pkg,<<"jesse">>,<<"1.8.1">>},2},
2222
{<<"meck">>,{pkg,<<"meck">>,<<"1.0.0">>},1},
23-
{<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.11.0">>},1},
24-
{<<"prometheus_cowboy">>,{pkg,<<"prometheus_cowboy">>,<<"0.1.8">>},1},
25-
{<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.11">>},2},
26-
{<<"quantile_estimator">>,{pkg,<<"quantile_estimator">>,<<"0.2.1">>},2},
23+
{<<"prometheus">>,{pkg,<<"prometheus">>,<<"5.0.0">>},1},
24+
{<<"prometheus_cowboy">>,{pkg,<<"prometheus_cowboy">>,<<"0.2.0">>},1},
25+
{<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.15">>},2},
26+
{<<"quantile_estimator">>,{pkg,<<"quantile_estimator">>,<<"1.0.2">>},2},
2727
{<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.7">>},2},
2828
{<<"ranch">>,{pkg,<<"ranch">>,<<"2.1.0">>},2},
2929
{<<"telemetry">>,{pkg,<<"telemetry">>,<<"1.3.0">>},1},
3030
{<<"uuid">>,{pkg,<<"uuid_erl">>,<<"2.0.7">>},1},
3131
{<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"6.4.0">>},1}]}.
3232
[
3333
{pkg_hash,[
34-
{<<"accept">>, <<"B33B127ABCA7CC948BBE6CAA4C263369ABF1347CFA9D8E699C6D214660F10CD1">>},
35-
{<<"amoc">>, <<"531B7E8CE39D40B4BF5A819868091C4451DC3D3FDAE753E3E3B1D0E5E8E81CDD">>},
34+
{<<"accept">>, <<"CD6E34A2D7E28CA38B2D3CB233734CA0C221EFBC1F171F91FEC5F162CC2D18DA">>},
35+
{<<"amoc">>, <<"BBE86809FD89E6441BAE4DB26C13232CD9128897D1D3F1ACD1D6854F02ECEC94">>},
3636
{<<"bbmustache">>, <<"0CABDCE0DB9FE6D3318131174B9F2B351328A4C0AFBEB3E6E99BB0E02E9B621D">>},
3737
{<<"cowboy">>, <<"F276D521A1FF88B2B9B4C54D0E753DA6C66DD7BE6C9FCA3D9418B561828A3731">>},
38-
{<<"cowlib">>, <<"DB8F7505D8332D98EF50A3EF34B34C1AFDDEC7506E4EE4DD4A3A266285D282CA">>},
39-
{<<"escalus">>, <<"EBD887FA44FB64484DB17AAC42D694E223DB932B54B47C6F8E24A0CFA67AFCD0">>},
40-
{<<"exml">>, <<"D46272177F3B779D75058005C744997034823AB3A237F9B30B56A583B063FDE3">>},
41-
{<<"fast_pbkdf2">>, <<"199BCEC73A1A246941E9465D3DC41052953B638128841ED24B29ED03CF70AF27">>},
42-
{<<"fast_scram">>, <<"BEEADB03D774640F0671681759CE53B2FF33CB58C86FD9BF2A793E2FC1ED0F5D">>},
38+
{<<"cowlib">>, <<"3C97A318A933962D1C12B96AB7C1D728267D2C523C25A5B57B0F93392B6E9E25">>},
39+
{<<"escalus">>, <<"A79B93BC013219078C13C004766287CC97045D75A8BF893163B8FF7E5DD521CD">>},
40+
{<<"exml">>, <<"4EA6B95AF18922F94FD67BBDEAA325A75CCE04487083C786E7417BA862D590E5">>},
41+
{<<"fast_pbkdf2">>, <<"72CDEE3C10C6B9B40E31194DE946A883CEEF6CF1F37D7FC9FD1A9D87502723F5">>},
42+
{<<"fast_scram">>, <<"FAD4DD185E0DEFA34B0E30654AB0CC4048E9324BCF65BB261E0A86BF3C604F9F">>},
4343
{<<"fusco">>, <<"3DD6A90151DFEF30EA1937CC44E9A59177C0094918388D9BCAA2F2DC5E2AE4AA">>},
44-
{<<"gun">>, <<"B4E4CBBF3026D21981C447E9E7CA856766046EFF693720BA43114D7F5DE36E87">>},
44+
{<<"gun">>, <<"B8F6B7D417E277D4C2B0DC3C07DFDF892447B087F1CC1CAFF9C0F556B884E33D">>},
4545
{<<"jesse">>, <<"C9E3670C7EE40F719734E3BC716578143AABA93FC7525A02A7D5CB300B3AD71E">>},
4646
{<<"meck">>, <<"24676CB6EE6951530093A93EDCD410CFE4CB59FE89444B875D35C9D3909A15D0">>},
47-
{<<"prometheus">>, <<"B95F8DE8530F541BD95951E18E355A840003672E5EDA4788C5FA6183406BA29A">>},
48-
{<<"prometheus_cowboy">>, <<"CFCE0BC7B668C5096639084FCD873826E6220EA714BF60A716F5BD080EF2A99C">>},
49-
{<<"prometheus_httpd">>, <<"F616ED9B85B536B195D94104063025A91F904A4CFC20255363F49A197D96C896">>},
50-
{<<"quantile_estimator">>, <<"EF50A361F11B5F26B5F16D0696E46A9E4661756492C981F7B2229EF42FF1CD15">>},
47+
{<<"prometheus">>, <<"8A37A3216D8DB019D19068602669C9819C099120F8E39994DD1BD3A3F5553376">>},
48+
{<<"prometheus_cowboy">>, <<"526F75D9850A9125496F78BCEECCA0F237BC7B403C976D44508543AE5967DAD9">>},
49+
{<<"prometheus_httpd">>, <<"8F767D819A5D36275EAB9264AFF40D87279151646776069BF69FBDBBD562BD75">>},
50+
{<<"quantile_estimator">>, <<"ECD281D40110FDD9BA62685531E4435E0839A52FD1058DA5564F1763E4642EF7">>},
5151
{<<"quickrand">>, <<"D2BD76676A446E6A058D678444B7FDA1387B813710D1AF6D6E29BB92186C8820">>},
5252
{<<"ranch">>, <<"2261F9ED9574DCFCC444106B9F6DA155E6E540B2F82BA3D42B339B93673B72A3">>},
5353
{<<"telemetry">>, <<"FEDEBBAE410D715CF8E7062C96A1EF32EC22E764197F70CDA73D82778D61E7A2">>},
5454
{<<"uuid">>, <<"B2078D2CC814F53AFA52D36C91E08962C7E7373585C623F4C0EA6DFB04B2AF94">>},
5555
{<<"worker_pool">>, <<"0347B805A8E5804B5676A9885FB3B9B6C1627099C449C3C67C0E8E6AF79E9AA6">>}]},
5656
{pkg_hash_ext,[
57-
{<<"accept">>, <<"11B18C220BCC2EAB63B5470C038EF10EB6783BCB1FCDB11AA4137DEFA5AC1BB8">>},
58-
{<<"amoc">>, <<"B8DD4F77BB94716ABC64E863158EEF8E1375CECB2F69E57DC4A293B0949D4985">>},
57+
{<<"accept">>, <<"CA69388943F5DAD2E7232A5478F16086E3C872F48E32B88B378E1885A59F5649">>},
58+
{<<"amoc">>, <<"059B9052917A3E691A67FDC4E143CE3DBCD2C4076573D347D1B0D3CADAB603DC">>},
5959
{<<"bbmustache">>, <<"688B33A4D5CC2D51F575ADF0B3683FC40A38314A2F150906EDCFC77F5B577B3B">>},
6060
{<<"cowboy">>, <<"8A7ABE6D183372CEB21CAA2709BEC928AB2B72E18A3911AA1771639BEF82651E">>},
61-
{<<"cowlib">>, <<"E1E1284DC3FC030A64B1AD0D8382AE7E99DA46C3246B815318A4B848873800A4">>},
62-
{<<"escalus">>, <<"370F55B3104DAD8FC2756BA7EB86BCA98684DFF712155E624EA6F00B829C58C3">>},
63-
{<<"exml">>, <<"86C154396A9B21EEB0EDB9636D0E2D493FE0F59EAAF40FCFE795210F31119D8F">>},
64-
{<<"fast_pbkdf2">>, <<"35EEC22629AAA739915843C7B7DE0D84657D1ECE972D8BBC86368747E9C14012">>},
65-
{<<"fast_scram">>, <<"FE0650A309FDF97C75E1EA812CCFB40EB464ECAFD3783E83AA17C7F572EDAB0B">>},
61+
{<<"cowlib">>, <<"4F00C879A64B4FE7C8FCB42A4281925E9FFDB928820B03C3AD325A617E857532">>},
62+
{<<"escalus">>, <<"FE4BACC8E6875334341872C188A5C68CD749DB362F189617D3520F6D25C7B145">>},
63+
{<<"exml">>, <<"03883AE3E27970E9DAC204B27CE330B54A6C2772455E43FE2319349DFF40B1DC">>},
64+
{<<"fast_pbkdf2">>, <<"74159FD09FB8BF5E97D25137C6C83C28E2CF7E97D7C127D83310DFD0904BD732">>},
65+
{<<"fast_scram">>, <<"39CB1D4C91C99E637E000A3864D274D8A9CB43D86EEC2495FE9546798DBFA015">>},
6666
{<<"fusco">>, <<"6343551BD1E824F2A6CA85E1158C5B37C320FD449FBFEC7450A73F192AAF9022">>},
67-
{<<"gun">>, <<"52FC7FC246BFC3B00E01AEA1C2854C70A366348574AB50C57DFE796D24A0101D">>},
67+
{<<"gun">>, <<"76022700C64287FEB4DF93A1795CFF6741B83FB37415C40C34C38D2A4645261A">>},
6868
{<<"jesse">>, <<"0EDED3F18623FDA2F25989804A06CF518B4ACF2E9365B18C8E8C013D7E3C906F">>},
6969
{<<"meck">>, <<"680A9BCFE52764350BEB9FB0335FB75FEE8E7329821416CEE0A19FEC35433882">>},
70-
{<<"prometheus">>, <<"719862351AABF4DF7079B05DC085D2BBCBE3AC0AC3009E956671B1D5AB88247D">>},
71-
{<<"prometheus_cowboy">>, <<"BA286BECA9302618418892D37BCD5DC669A6CC001F4EB6D6AF85FF81F3F4F34C">>},
72-
{<<"prometheus_httpd">>, <<"0BBE831452CFDF9588538EB2F570B26F30C348ADAE5E95A7D87F35A5910BCF92">>},
73-
{<<"quantile_estimator">>, <<"282A8A323CA2A845C9E6F787D166348F776C1D4A41EDE63046D72D422E3DA946">>},
70+
{<<"prometheus">>, <<"80D29564A5DC4490B53FD225D752B65FB0DBEBA41497F96D62223338127C5659">>},
71+
{<<"prometheus_cowboy">>, <<"2C7EB12F4B970D91E3B47BAAD0F138F6ADC34E53EEB0AE18068FF0AFAB441B24">>},
72+
{<<"prometheus_httpd">>, <<"67736D000745184D5013C58A63E947821AB90CB9320BC2E6AE5D3061C6FFE039">>},
73+
{<<"quantile_estimator">>, <<"DB404793D6384995A1AC6DD973E2CEE5BE9FCC128765BDBA53D87C564E296B64">>},
7474
{<<"quickrand">>, <<"B8ACBF89A224BC217C3070CA8BEBC6EB236DBE7F9767993B274084EA044D35F0">>},
7575
{<<"ranch">>, <<"244EE3FA2A6175270D8E1FC59024FD9DBC76294A321057DE8F803B1479E76916">>},
7676
{<<"telemetry">>, <<"7015FC8919DBE63764F4B4B87A95B7C0996BD539E0D499BE6EC9D7F3875B79E6">>},

src/helpers/amoc_xmpp_muc.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
description => "Number of users each room has"}
2525
]).
2626

27-
-spec init() -> ok.
27+
-spec init() -> boolean().
2828
init() ->
2929
amoc_metrics:init(counters, muc_rooms_created),
3030
amoc_metrics:init(times, room_creation_response_time).

src/scenarios/mongoose_muc.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ init() ->
8989
amoc_metrics:init(times, muc_message_ttd),
9090
ok.
9191

92-
-spec start(amoc_scenario:user_id()) -> any().
92+
-spec start(amoc_scenario:user_id()) -> no_return().
9393
start(Id) ->
9494
{ok, Client, _Spec} = amoc_xmpp:connect_or_exit(Id, extra_user_spec()),
9595
send_presence_available(Client),

src/scenarios/mongoose_muc_light.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ init() ->
8888
amoc_metrics:init(times, muc_message_ttd),
8989
ok.
9090

91-
-spec start(amoc_scenario:user_id()) -> any().
91+
-spec start(amoc_scenario:user_id()) -> no_return().
9292
start(Id) ->
9393
{ok, Client, _Spec} = amoc_xmpp:connect_or_exit(Id, extra_user_spec()),
9494
send_presence_available(Client),

0 commit comments

Comments
 (0)