Skip to content

Commit 534dc6c

Browse files
chrzaszczchrzaszcz
authored
Merge pull request #4549 from esl/erlang-28
Support Erlang 28
2 parents 78771d1 + 03d8ce6 commit 534dc6c

File tree

13 files changed

+303
-226
lines changed

13 files changed

+303
-226
lines changed

‎.circleci/template.yml

Lines changed: 141 additions & 141 deletions
Large diffs are not rendered by default.

‎.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
## the full list of supported (prebuilt) OTP versions for ubuntu-22.04 runners
2828
## can be found here:
2929
## https://builds.hex.pm/builds/otp/ubuntu-22.04/builds.txt
30-
otp: [ '26.2.5.12', '27.3.4' ]
30+
otp: [ '27.3.4.1', '28.0.1' ]
3131
runs-on: ubuntu-22.04
3232
env:
3333
PRESET: 'small_tests'
@@ -67,17 +67,17 @@ jobs:
6767
matrix:
6868
preset: [internal_mnesia, pgsql_mnesia, mysql_redis, odbc_mssql_mnesia,
6969
ldap_mnesia, elasticsearch_and_cassandra_mnesia]
70-
otp: [ '27.3.4' ]
70+
otp: [ '28.0.1' ]
7171
include:
7272
- test-spec: "default.spec"
7373
- preset: elasticsearch_and_cassandra_mnesia
7474
test-spec: "mam.spec"
7575
- preset: ldap_mnesia
7676
test-spec: "default.spec"
77-
otp: '26.2.5.12'
77+
otp: '27.3.4.1'
7878
- preset: pgsql_mnesia
7979
test-spec: "default.spec"
80-
otp: '26.2.5.12'
80+
otp: '27.3.4.1'
8181
runs-on: ubuntu-22.04
8282
steps:
8383
- uses: actions/checkout@v3
@@ -103,11 +103,11 @@ jobs:
103103
fail-fast: false
104104
matrix:
105105
preset: [pgsql_mnesia, mysql_redis, odbc_mssql_mnesia]
106-
otp: [ '27.3.4' ]
106+
otp: [ '28.0.1' ]
107107
test-spec: ["dynamic_domains.spec"]
108108
include:
109109
- preset: pgsql_mnesia
110-
otp: '26.2.5.12'
110+
otp: '27.3.4.1'
111111
test-spec: "dynamic_domains.spec"
112112
runs-on: ubuntu-22.04
113113
steps:
@@ -143,7 +143,7 @@ jobs:
143143
strategy:
144144
fail-fast: false
145145
matrix:
146-
otp: [ '26.2.5.12' ]
146+
otp: [ '27.3.4.1' ]
147147
runs-on: ubuntu-22.04
148148
steps:
149149
- uses: actions/checkout@v3
@@ -160,7 +160,7 @@ jobs:
160160
strategy:
161161
fail-fast: false
162162
matrix:
163-
otp: [ '26.2.5.12' ]
163+
otp: [ '27.3.4.1' ]
164164
runs-on: ubuntu-22.04
165165
steps:
166166
- uses: actions/checkout@v3
@@ -177,7 +177,7 @@ jobs:
177177
strategy:
178178
fail-fast: false
179179
matrix:
180-
otp: [ '26.2.5.12' ]
180+
otp: [ '27.3.4.1' ]
181181
runs-on: ubuntu-22.04
182182
steps:
183183
- uses: actions/checkout@v3
@@ -197,7 +197,7 @@ jobs:
197197
pkg: [ubuntu-jammy]
198198
runs-on: ubuntu-22.04
199199
env:
200-
pkg_OTP_VERSION: "27.3.4"
200+
pkg_OTP_VERSION: "28.0.1"
201201
pkg_PLATFORM: ${{matrix.pkg}}
202202
GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
203203
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}

‎big_tests/rebar.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
{ranch, "2.2.0"},
1818
{cowboy, "2.13.0"},
1919
{csv, "3.0.3", {pkg, csve}},
20-
{amqp_client, "4.0.3"},
21-
{rabbit_common, "4.0.3"},
20+
%% TODO Switch back to using hex package when version 4.2.0 gets released
21+
{amqp_client, {git, "https://github.com/jacekwegr/amqp_client.git", {branch, "main"}}},
22+
{rabbit_common, {git, "https://github.com/jacekwegr/rabbit_common.git", {branch, "main"}}},
2223
{esip, "1.0.57"},
2324
{jid, "2.2.0", {pkg, mongoose_jid}},
2425
{ct_groups_summary_hook, "0.1.1"},

‎big_tests/rebar.lock

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{"1.2.0",
2-
[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"4.0.3">>},0},
2+
[{<<"amqp_client">>,
3+
{git,"https://github.com/jacekwegr/amqp_client.git",
4+
{ref,"d11173bc0abafbf766447083c371469c34622b42"}},
5+
0},
36
{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.12.2">>},0},
47
{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.13.0">>},0},
58
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.14.0">>},1},
69
{<<"credentials_obfuscation">>,
7-
{pkg,<<"credentials_obfuscation">>,<<"3.4.0">>},
10+
{pkg,<<"credentials_obfuscation">>,<<"3.5.0">>},
811
1},
912
{<<"csv">>,{pkg,<<"csve">>,<<"3.0.3">>},0},
1013
{<<"ct_groups_summary_hook">>,
@@ -24,7 +27,10 @@
2427
{<<"p1_utils">>,{pkg,<<"p1_utils">>,<<"1.0.26">>},1},
2528
{<<"proper">>,{pkg,<<"proper">>,<<"1.4.0">>},0},
2629
{<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.7">>},2},
27-
{<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"4.0.3">>},0},
30+
{<<"rabbit_common">>,
31+
{git,"https://github.com/jacekwegr/rabbit_common.git",
32+
{ref,"18679a0c9a9573bcc5ebc8facc125264f7a61051"}},
33+
0},
2834
{<<"ranch">>,{pkg,<<"ranch">>,<<"2.2.0">>},0},
2935
{<<"recon">>,{pkg,<<"recon">>,<<"2.5.6">>},1},
3036
{<<"stringprep">>,{pkg,<<"stringprep">>,<<"1.0.29">>},1},
@@ -35,11 +41,10 @@
3541
{<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"6.4.0">>},1}]}.
3642
[
3743
{pkg_hash,[
38-
{<<"amqp_client">>, <<"C7DCC8031C780CD39EC586BA827A8EB26E006E9761AF8D3F58FDED11F645EBD4">>},
3944
{<<"bbmustache">>, <<"0CABDCE0DB9FE6D3318131174B9F2B351328A4C0AFBEB3E6E99BB0E02E9B621D">>},
4045
{<<"cowboy">>, <<"09D770DD5F6A22CC60C071F432CD7CB87776164527F205C5A6B0F24FF6B38990">>},
4146
{<<"cowlib">>, <<"623791C56C1CC9DF54A71A9C55147A401549917F00A2E48A6AE12B812C586CED">>},
42-
{<<"credentials_obfuscation">>, <<"34E18B126B3AEFD6E8143776FBE1CECEEA6792307C99AC5EE8687911F048CFD7">>},
47+
{<<"credentials_obfuscation">>, <<"61E282ADFB4439486B3994FAAEC69543C7EE6CC7E70C6340E8853FD9DEAF8219">>},
4348
{<<"csv">>, <<"69E7D9B3FDC72016644368762C6A3E6CBFEB85BCCADBF1BD99AB6C827E360E04">>},
4449
{<<"ct_groups_summary_hook">>, <<"21B94902B6CF2D345F4D790D34B49654E71CB8E570DCCC9C1C3616DAE720A7AA">>},
4550
{<<"escalus">>, <<"A6BC39DD7648E56FB4514E323FC566C59B8B4F53A40ED6E89811BD4E5325DA53">>},
@@ -56,7 +61,6 @@
5661
{<<"p1_utils">>, <<"67B0C4AC9FA3BA3EF563B31AA111B0A004439A37FAC85E027F1C3617E1C7EC6C">>},
5762
{<<"proper">>, <<"89A44B8C39D28BB9B4BE8E4D715D534905B325470F2E0EC5E004D12484A79434">>},
5863
{<<"quickrand">>, <<"D2BD76676A446E6A058D678444B7FDA1387B813710D1AF6D6E29BB92186C8820">>},
59-
{<<"rabbit_common">>, <<"E927B882733D122F6802662220BDB1A83774852DBE67D21D4E33AAF54F3998DD">>},
6064
{<<"ranch">>, <<"25528F82BC8D7C6152C57666CA99EC716510FE0925CB188172F41CE93117B1B0">>},
6165
{<<"recon">>, <<"9052588E83BFEDFD9B72E1034532AEE2A5369D9D9343B61AEB7FBCE761010741">>},
6266
{<<"stringprep">>, <<"02F23E8C3A219A3DFE40A22E908BECE3A2F68AF0FF599EA8A7B714ECB21E62EE">>},
@@ -66,11 +70,10 @@
6670
{<<"wait_helper">>, <<"942967D8B84A2F62DC13F57C7F1B3182D0DA8D3F8D2B4210E85427E12164D8FF">>},
6771
{<<"worker_pool">>, <<"0347B805A8E5804B5676A9885FB3B9B6C1627099C449C3C67C0E8E6AF79E9AA6">>}]},
6872
{pkg_hash_ext,[
69-
{<<"amqp_client">>, <<"AE945F7280617E9A4B17A6D49E3A2F496D716E8088EC29D8E94ECC79E5DA7458">>},
7073
{<<"bbmustache">>, <<"688B33A4D5CC2D51F575ADF0B3683FC40A38314A2F150906EDCFC77F5B577B3B">>},
7174
{<<"cowboy">>, <<"E724D3A70995025D654C1992C7B11DBFEA95205C047D86FF9BF1CDA92DDC5614">>},
7275
{<<"cowlib">>, <<"0AF652D1550C8411C3B58EED7A035A7FB088C0B86AFF6BC504B0BC3B7F791AA2">>},
73-
{<<"credentials_obfuscation">>, <<"738ACE0ED5545D2710D3F7383906FC6F6B582D019036E5269C4DBD85DBCED566">>},
76+
{<<"credentials_obfuscation">>, <<"843ADBE3246861CE0F1A0FA3222F384834EB31DEFD8D6B9CBA7AFD2977C957BC">>},
7477
{<<"csv">>, <<"741D1A55AABADAA3E0FE13051050101A73E90C4570B9F9403A939D9546813521">>},
7578
{<<"ct_groups_summary_hook">>, <<"997CDE48FEB0C398989E4091A341D4FFF43CFA06CDB8FB2E80CC4A0E0362691C">>},
7679
{<<"escalus">>, <<"34559C804CC44F2ADC2B8B466153E023A4C9D76AE97D18CA5F5447C1D4F85D07">>},
@@ -87,7 +90,6 @@
8790
{<<"p1_utils">>, <<"D0379E8C1156B98BD64F8129C1DE022FCCA4F2FDB7486CE73BF0ED2C3376B04C">>},
8891
{<<"proper">>, <<"18285842185BD33EFBDA97D134A5CB5A0884384DB36119FEE0E3CFA488568CBB">>},
8992
{<<"quickrand">>, <<"B8ACBF89A224BC217C3070CA8BEBC6EB236DBE7F9767993B274084EA044D35F0">>},
90-
{<<"rabbit_common">>, <<"EAD31BA292C2CC5FDA48A486417D7CFE8966F661994D7ED6C3E5F8840828E8EC">>},
9193
{<<"ranch">>, <<"FA0B99A1780C80218A4197A59EA8D3BDAE32FBFF7E88527D7D8A4787EFF4F8E7">>},
9294
{<<"recon">>, <<"96C6799792D735CC0F0FD0F86267E9D351E63339CBE03DF9D162010CEFC26BB0">>},
9395
{<<"stringprep">>, <<"928EBA304C3006EB1512110EBD7B87DB163B00859A09375A1E4466152C6C462A">>},

‎rebar.config

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@
8989
{epgsql, "4.7.1"},
9090
{eodbc, "0.2.0"},
9191
{tirerl, "1.2.0"},
92-
{amqp_client, "4.0.3"},
93-
{rabbit_common, "4.0.3"},
92+
%% TODO Switch back to using hex package when version 4.2.0 gets released
93+
{amqp_client, {git, "https://github.com/jacekwegr/amqp_client.git", {branch, "main"}}},
94+
{rabbit_common, {git, "https://github.com/jacekwegr/rabbit_common.git", {branch, "main"}}},
9495
{eredis, "1.7.1"},
9596
{erlcloud, "3.8.3"},
9697

@@ -224,6 +225,7 @@
224225

225226
{cover_print_enabled, true}.
226227
{cover_export_enabled, true}.
228+
{cover_excl_mods, [eldap_filter_yecc]}.
227229
{coveralls_coverdata, "/tmp/*.coverdata"}.
228230
{coveralls_service_name, "github"}.
229231
{coveralls_parallel, true}.

‎rebar.lock

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{"1.2.0",
22
[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.6">>},2},
3-
{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"4.0.3">>},0},
3+
{<<"amqp_client">>,
4+
{git,"https://github.com/jacekwegr/amqp_client.git",
5+
{ref,"d11173bc0abafbf766447083c371469c34622b42"}},
6+
0},
47
{<<"backoff">>,{pkg,<<"backoff">>,<<"1.1.6">>},1},
58
{<<"base16">>,{pkg,<<"base16">>,<<"2.0.1">>},1},
69
{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.12.2">>},0},
@@ -17,7 +20,7 @@
1720
{ref,"0b7fa8c8f87306ea1ab88f841af78ca399768a10"}},
1821
0},
1922
{<<"credentials_obfuscation">>,
20-
{pkg,<<"credentials_obfuscation">>,<<"3.4.0">>},
23+
{pkg,<<"credentials_obfuscation">>,<<"3.5.0">>},
2124
1},
2225
{<<"eini">>,{pkg,<<"eini">>,<<"1.2.9">>},1},
2326
{<<"eodbc">>,{pkg,<<"eodbc">>,<<"0.2.0">>},0},
@@ -76,7 +79,7 @@
7679
1},
7780
{<<"nksip">>,
7881
{git,"https://github.com/esl/nksip.git",
79-
{ref,"e55adf8a54b8d9262ce157cf2d8f88b4b94b7023"}},
82+
{ref,"fb35df3ee7b553a6e843b0d5389d9b2c9d338f03"}},
8083
0},
8184
{<<"observer_cli">>,{pkg,<<"observer_cli">>,<<"1.8.2">>},0},
8285
{<<"opuntia">>,{pkg,<<"opuntia">>,<<"1.1.2">>},0},
@@ -92,7 +95,10 @@
9295
{<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.13">>},1},
9396
{<<"quantile_estimator">>,{pkg,<<"quantile_estimator">>,<<"1.0.2">>},1},
9497
{<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.7">>},1},
95-
{<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"4.0.3">>},0},
98+
{<<"rabbit_common">>,
99+
{git,"https://github.com/jacekwegr/rabbit_common.git",
100+
{ref,"18679a0c9a9573bcc5ebc8facc125264f7a61051"}},
101+
0},
96102
{<<"ranch">>,{pkg,<<"ranch">>,<<"2.2.0">>},0},
97103
{<<"re2">>,{pkg,<<"re2">>,<<"1.9.7">>},1},
98104
{<<"recon">>,{pkg,<<"recon">>,<<"2.5.6">>},0},
@@ -119,7 +125,6 @@
119125
[
120126
{pkg_hash,[
121127
{<<"accept">>, <<"AD44AC7D704BF70EF8FB2E313EF5B978F9D1330BDDAC64509E93AFDA13281215">>},
122-
{<<"amqp_client">>, <<"C7DCC8031C780CD39EC586BA827A8EB26E006E9761AF8D3F58FDED11F645EBD4">>},
123128
{<<"backoff">>, <<"83B72ED2108BA1EE8F7D1C22E0B4A00CFE3593A67DBC792799E8CCE9F42F796B">>},
124129
{<<"base16">>, <<"F0549F732E03BE8124ED0D19FD5EE52146CC8BE24C48CBC3F23AB44B157F11A2">>},
125130
{<<"bbmustache">>, <<"0CABDCE0DB9FE6D3318131174B9F2B351328A4C0AFBEB3E6E99BB0E02E9B621D">>},
@@ -131,7 +136,7 @@
131136
{<<"cowboy_swagger">>, <<"163091DB15BFCFA592CBA0E083E386D0DEC84D43CCF5E542238125E50B1A024B">>},
132137
{<<"cowlib">>, <<"623791C56C1CC9DF54A71A9C55147A401549917F00A2E48A6AE12B812C586CED">>},
133138
{<<"cpool">>, <<"76222AA1DAC0F8089707167BD69D221EDA63DB65B8BD67DBF6E133075392EEDC">>},
134-
{<<"credentials_obfuscation">>, <<"34E18B126B3AEFD6E8143776FBE1CECEEA6792307C99AC5EE8687911F048CFD7">>},
139+
{<<"credentials_obfuscation">>, <<"61E282ADFB4439486B3994FAAEC69543C7EE6CC7E70C6340E8853FD9DEAF8219">>},
135140
{<<"eini">>, <<"FCC3CBD49BBDD9A1D9735C7365DAFFCD84481CCE81E6CB80537883AA44AC4895">>},
136141
{<<"eodbc">>, <<"81AC713AE657FC4F67FEA210AE6D4575DDD7003C96953363908EA35E80F33F22">>},
137142
{<<"epgsql">>, <<"D4E47CAE46C18C8AFA88E34D59A9B4BAE16368D7CE1EB3DA24FA755EB28393EB">>},
@@ -169,7 +174,6 @@
169174
{<<"prometheus_httpd">>, <<"F086390B4E4E3F41112889B745BAC53D26437B6139496E6700C2508858F5985B">>},
170175
{<<"quantile_estimator">>, <<"ECD281D40110FDD9BA62685531E4435E0839A52FD1058DA5564F1763E4642EF7">>},
171176
{<<"quickrand">>, <<"D2BD76676A446E6A058D678444B7FDA1387B813710D1AF6D6E29BB92186C8820">>},
172-
{<<"rabbit_common">>, <<"E927B882733D122F6802662220BDB1A83774852DBE67D21D4E33AAF54F3998DD">>},
173177
{<<"ranch">>, <<"25528F82BC8D7C6152C57666CA99EC716510FE0925CB188172F41CE93117B1B0">>},
174178
{<<"re2">>, <<"8114654E72EF62F605A8A393F219702F253CB7A02F671503918B76D0614DB046">>},
175179
{<<"recon">>, <<"9052588E83BFEDFD9B72E1034532AEE2A5369D9D9343B61AEB7FBCE761010741">>},
@@ -187,7 +191,6 @@
187191
{<<"worker_pool">>, <<"0347B805A8E5804B5676A9885FB3B9B6C1627099C449C3C67C0E8E6AF79E9AA6">>}]},
188192
{pkg_hash_ext,[
189193
{<<"accept">>, <<"A5167FA1AE90315C3F1DD189446312F8A55D00EFA357E9C569BDA47736B874C3">>},
190-
{<<"amqp_client">>, <<"AE945F7280617E9A4B17A6D49E3A2F496D716E8088EC29D8E94ECC79E5DA7458">>},
191194
{<<"backoff">>, <<"CF0CFFF8995FB20562F822E5CC47D8CCF664C5ECDC26A684CBE85C225F9D7C39">>},
192195
{<<"base16">>, <<"06EA2D48343282E712160BA89F692B471DB8B36ABE8394F3445FF9032251D772">>},
193196
{<<"bbmustache">>, <<"688B33A4D5CC2D51F575ADF0B3683FC40A38314A2F150906EDCFC77F5B577B3B">>},
@@ -199,7 +202,7 @@
199202
{<<"cowboy_swagger">>, <<"DCD5ADEE2FED2B39E99F06070D080EB051CB981A411103099034931F94E15F62">>},
200203
{<<"cowlib">>, <<"0AF652D1550C8411C3B58EED7A035A7FB088C0B86AFF6BC504B0BC3B7F791AA2">>},
201204
{<<"cpool">>, <<"430E18DF4A9D584EB1ED0D196A87CC02E878AF5B4888BFDC9B65F86A96480E30">>},
202-
{<<"credentials_obfuscation">>, <<"738ACE0ED5545D2710D3F7383906FC6F6B582D019036E5269C4DBD85DBCED566">>},
205+
{<<"credentials_obfuscation">>, <<"843ADBE3246861CE0F1A0FA3222F384834EB31DEFD8D6B9CBA7AFD2977C957BC">>},
203206
{<<"eini">>, <<"DA64AE8DB7C2F502E6F20CDF44CD3D9BE364412B87FF49FEBF282540F673DFCB">>},
204207
{<<"eodbc">>, <<"ACF72A61349AFD535306F036B8A17C45FA095E039F7C0211E671CCCBD709A8C8">>},
205208
{<<"epgsql">>, <<"B6D86B7DC42C8555B1D4E20880E5099D6D6D053148000E188E548F98E4E01836">>},
@@ -237,7 +240,6 @@
237240
{<<"prometheus_httpd">>, <<"9B5A44D1F6FBB3C3FE6F85F06DAFE680AD9FFD591EC65A10BB51DFF0FBBE45D2">>},
238241
{<<"quantile_estimator">>, <<"DB404793D6384995A1AC6DD973E2CEE5BE9FCC128765BDBA53D87C564E296B64">>},
239242
{<<"quickrand">>, <<"B8ACBF89A224BC217C3070CA8BEBC6EB236DBE7F9767993B274084EA044D35F0">>},
240-
{<<"rabbit_common">>, <<"EAD31BA292C2CC5FDA48A486417D7CFE8966F661994D7ED6C3E5F8840828E8EC">>},
241243
{<<"ranch">>, <<"FA0B99A1780C80218A4197A59EA8D3BDAE32FBFF7E88527D7D8A4787EFF4F8E7">>},
242244
{<<"re2">>, <<"FF0703CA095B5BEBF57DD12571AF24B3BA404180E9B5E43128790B5D31EBE803">>},
243245
{<<"recon">>, <<"96C6799792D735CC0F0FD0F86267E9D351E63339CBE03DF9D162010CEFC26BB0">>},

‎src/auth/ejabberd_auth_external.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ get_cache_option(HostType) ->
241241
LServer :: jid:lserver(),
242242
Password :: binary()) -> boolean().
243243
check_password_extauth(HostType, LUser, LServer, Password) ->
244-
extauth:check_password(HostType, LUser, LServer, Password) andalso Password /= "".
244+
extauth:check_password(HostType, LUser, LServer, Password) andalso Password =/= <<>>.
245245

246246
-spec check_password_cache(HostType :: mongooseim:host_type(),
247247
LUser :: jid:luser(),

0 commit comments

Comments
 (0)