Skip to content

Commit d3bb612

Browse files
committed
Add OTP 27 to build / release workflow
1 parent 6809242 commit d3bb612

File tree

6 files changed

+57
-20
lines changed

6 files changed

+57
-20
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
platform: [ubuntu-latest]
15-
otp-version: [24, 25, 26]
15+
otp-version: [24, 25, 26, 27]
1616
runs-on: ${{ matrix.platform }}
1717
container:
1818
image: erlang:${{ matrix.otp-version }}
@@ -48,7 +48,7 @@ jobs:
4848
- name: Lint
4949
run: rebar3 lint
5050
- name: Generate Dialyzer PLT for usage in CT Tests
51-
run: dialyzer --build_plt --apps erts kernel stdlib compiler crypto
51+
run: dialyzer --build_plt --apps erts kernel stdlib compiler crypto parsetools
5252
- name: Start epmd as daemon
5353
run: epmd -daemon
5454
- name: Run CT Tests
@@ -92,7 +92,7 @@ jobs:
9292
- name: Lint
9393
run: rebar3 lint
9494
- name: Generate Dialyzer PLT for usage in CT Tests
95-
run: dialyzer --build_plt --apps erts kernel stdlib crypto compiler
95+
run: dialyzer --build_plt --apps erts kernel stdlib crypto compiler parsetools
9696
- name: Start epmd as daemon
9797
run: erl -sname a -noinput -eval "halt(0)."
9898
- name: Run CT Tests

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
matrix:
1818
platform: [ubuntu-latest]
19-
otp-version: [24, 25, 26]
19+
otp-version: [24, 25, 26, 27]
2020
runs-on: ${{ matrix.platform }}
2121
container:
2222
image: erlang:${{ matrix.otp-version }}
@@ -52,7 +52,7 @@ jobs:
5252
- name: Lint
5353
run: rebar3 lint
5454
- name: Generate Dialyzer PLT for usage in CT Tests
55-
run: dialyzer --build_plt --apps erts kernel stdlib
55+
run: dialyzer --build_plt --apps erts kernel stdlib crypto compiler parsetools
5656
- name: Start epmd as daemon
5757
run: epmd -daemon
5858
- name: Run CT Tests
@@ -106,9 +106,9 @@ jobs:
106106
- name: Checkout
107107
uses: actions/checkout@v2
108108
- name: Install Erlang
109-
run: choco install -y erlang --version 24.0
109+
run: choco install -y erlang --version 27.0
110110
- name: Install rebar3
111-
run: choco install -y rebar3 --version 3.22.1
111+
run: choco install -y rebar3 --version 3.24.0
112112
- name: Compile
113113
run: rebar3 compile
114114
- name: Escriptize LSP Server
@@ -122,7 +122,7 @@ jobs:
122122
- name: Lint
123123
run: rebar3 lint
124124
- name: Generate Dialyzer PLT for usage in CT Tests
125-
run: dialyzer --build_plt --apps erts kernel stdlib crypto compiler
125+
run: dialyzer --build_plt --apps erts kernel stdlib crypto compiler parsetools
126126
- name: Start epmd as daemon
127127
run: erl -sname a -noinput -eval "halt(0)."
128128
- name: Run CT Tests

apps/els_lsp/test/els_completion_SUITE.erl

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1691,7 +1691,22 @@ resolve_application_remote_otp(Config) ->
16911691
OtpRelease = list_to_integer(erlang:system_info(otp_release)),
16921692
Value =
16931693
case has_eep48(file) of
1694-
true when OtpRelease >= 26 ->
1694+
true when OtpRelease >= 27 ->
1695+
<<
1696+
"## file:write/2\n\n"
1697+
"---\n\n```erlang\n\n"
1698+
" write(File, Bytes) when is_pid(File) orelse is_atom(File)\n\n"
1699+
" write(#file_descriptor{module = Module} = Handle, Bytes) \n\n"
1700+
" write(_, _) \n\n"
1701+
"```\n\n"
1702+
"```erlang\n"
1703+
"-spec write(IoDevice, Bytes) -> ok | {error, Reason} when\n"
1704+
" IoDevice :: io_device() | io:device(),\n"
1705+
" Bytes :: iodata(),\n"
1706+
" Reason :: posix() | badarg | terminated.\n"
1707+
"```"
1708+
>>;
1709+
true when OtpRelease == 26 ->
16951710
<<
16961711
"```erlang\nwrite(IoDevice, Bytes) -> ok | {error, "
16971712
"Reason}\nwhen\n IoDevice :: io_device() | io:device(),\n"
@@ -1951,8 +1966,16 @@ resolve_type_application_remote_otp(Config) ->
19511966
<<"name_all/0">>
19521967
),
19531968
#{result := Result} = els_client:completionitem_resolve(Selected),
1969+
OtpRelease = list_to_integer(erlang:system_info(otp_release)),
19541970
Value =
19551971
case has_eep48(file) of
1972+
true when OtpRelease >= 27 ->
1973+
<<
1974+
"```erlang\n"
1975+
"-type name_all() :: string() | atom() | deep_list() |"
1976+
" (RawFilename :: binary()).\n"
1977+
"```"
1978+
>>;
19561979
true ->
19571980
<<
19581981
"```erlang\n-type name_all() ::\n string() |"

apps/els_lsp/test/els_hover_SUITE.erl

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,21 @@ remote_call_otp(Config) ->
213213
OtpRelease = list_to_integer(erlang:system_info(otp_release)),
214214
Value =
215215
case has_eep48(file) of
216-
true when OtpRelease >= 26 ->
216+
true when OtpRelease >= 27 ->
217+
<<
218+
"## file:write/2\n\n---\n\n"
219+
"```erlang\n\n write(File, Bytes) when is_pid(File) orelse is_atom(File)\n\n"
220+
" write(#file_descriptor{module = Module} = Handle, Bytes) \n\n"
221+
" write(_, _) \n\n"
222+
"```\n\n"
223+
"```erlang\n"
224+
"-spec write(IoDevice, Bytes) -> ok | {error, Reason} when\n"
225+
" IoDevice :: io_device() | io:device(),\n"
226+
" Bytes :: iodata(),\n"
227+
" Reason :: posix() | badarg | terminated.\n"
228+
"```"
229+
>>;
230+
true when OtpRelease == 26 ->
217231
<<
218232
"```erlang\nwrite(IoDevice, Bytes) -> ok | {error, "
219233
"Reason}\nwhen\n IoDevice :: io_device() | io:device(),\n"

rebar.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{docsh, "0.7.2"},
1616
{elvis_core, "~> 3.2.2"},
1717
{rebar3_format, "0.8.2"},
18-
{erlfmt, "1.3.0"},
18+
{erlfmt, "1.5.0"},
1919
{ephemeral, "2.0.4"},
2020
{tdiff, "0.1.2"},
2121
{uuid, "2.0.1", {pkg, uuid_erl}},

rebar.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{"1.2.0",
22
[{<<"bucs">>,{pkg,<<"bucs">>,<<"1.0.16">>},1},
33
{<<"docsh">>,{pkg,<<"docsh">>,<<"0.7.2">>},0},
4-
{<<"elvis_core">>,{pkg,<<"elvis_core">>,<<"3.2.2">>},0},
4+
{<<"elvis_core">>,{pkg,<<"elvis_core">>,<<"3.2.5">>},0},
55
{<<"ephemeral">>,{pkg,<<"ephemeral">>,<<"2.0.4">>},0},
6-
{<<"erlfmt">>,{pkg,<<"erlfmt">>,<<"1.3.0">>},0},
6+
{<<"erlfmt">>,{pkg,<<"erlfmt">>,<<"1.5.0">>},0},
77
{<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},2},
88
{<<"gradualizer">>,
99
{git,"https://github.com/josefs/Gradualizer.git",
1010
{ref,"3021d29d82741399d131e3be38d2a8db79d146d4"}},
1111
0},
1212
{<<"jsx">>,{pkg,<<"jsx">>,<<"3.0.0">>},0},
13-
{<<"katana_code">>,{pkg,<<"katana_code">>,<<"2.1.0">>},1},
13+
{<<"katana_code">>,{pkg,<<"katana_code">>,<<"2.1.1">>},1},
1414
{<<"providers">>,{pkg,<<"providers">>,<<"1.8.1">>},1},
1515
{<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.7">>},1},
1616
{<<"rebar3_format">>,{pkg,<<"rebar3_format">>,<<"0.8.2">>},0},
@@ -26,12 +26,12 @@
2626
{pkg_hash,[
2727
{<<"bucs">>, <<"D69A4CD6D1238CD1ADC5C95673DBDE0F8459A5DBB7D746516434D8C6D935E96F">>},
2828
{<<"docsh">>, <<"F893D5317A0E14269DD7FE79CF95FB6B9BA23513DA0480EC6E77C73221CAE4F2">>},
29-
{<<"elvis_core">>, <<"D5AE5FB7ACDF9D23A2AA3F6E4610490A06F7E8FB33EE65E09C5EA3A0ECF64A73">>},
29+
{<<"elvis_core">>, <<"7845047A1CABD0F575EE8A95D2223F2F2040FBDA78C81EEE933090B857611BA0">>},
3030
{<<"ephemeral">>, <<"B3E57886ADD5D90C82FE3880F5954978222A122CB8BAA123667401BBAAEC51D6">>},
31-
{<<"erlfmt">>, <<"672994B92B1A809C04C46F0B781B447BF9AB7A515F5856A96177BC1962F100A9">>},
31+
{<<"erlfmt">>, <<"5DDECA120A6E8E0A0FAB7D0BB9C2339D841B1C9E51DD135EE583256DEF20DE25">>},
3232
{<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>},
3333
{<<"jsx">>, <<"20A170ABD4335FC6DB24D5FAD1E5D677C55DADF83D1B20A8A33B5FE159892A39">>},
34-
{<<"katana_code">>, <<"0C42BDCD7E59995876AED9F678CF62E3D12EF42E0FBB2190556E64BFEBDD15C6">>},
34+
{<<"katana_code">>, <<"9AC515E6B5AE4903CD7B6C9161ABFBA49B610B6F3E19E8F0542802A4316C2405">>},
3535
{<<"providers">>, <<"70B4197869514344A8A60E2B2A4EF41CA03DEF43CFB1712ECF076A0F3C62F083">>},
3636
{<<"quickrand">>, <<"D2BD76676A446E6A058D678444B7FDA1387B813710D1AF6D6E29BB92186C8820">>},
3737
{<<"rebar3_format">>, <<"2D64DA61E0B87FCA6C4512ADA6D9CBC2B27ADC9AE6844178561147E7121761BD">>},
@@ -42,12 +42,12 @@
4242
{pkg_hash_ext,[
4343
{<<"bucs">>, <<"FF6A5C72A500AD7AEC1EE3BA164AE3C450EADEE898B0D151E1FACA18AC8D0D62">>},
4444
{<<"docsh">>, <<"4E7DB461BB07540D2BC3D366B8513F0197712D0495BB85744F367D3815076134">>},
45-
{<<"elvis_core">>, <<"3786F027751CC265E7389BF5AC1329DB547510D80F499B45EFE771BDAF889B36">>},
45+
{<<"elvis_core">>, <<"34D9218F0B8072511903BF6CCBF59EB1765DECFC73FCC6833BA5C8959DB7F383">>},
4646
{<<"ephemeral">>, <<"4B293D80F75F9C4575FF4B9C8E889A56802F40B018BF57E74F19644EFEE6C850">>},
47-
{<<"erlfmt">>, <<"2A84AA1EBA2F4FCD7DD31D5C57E9DE2BC2705DDA18DA4553F27DF7114CFAA052">>},
47+
{<<"erlfmt">>, <<"3933A40CFBE790AD94E5B650B36881DE70456319263C1479B556E9AFDBD80C75">>},
4848
{<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>},
4949
{<<"jsx">>, <<"37BECA0435F5CA8A2F45F76A46211E76418FBEF80C36F0361C249FC75059DC6D">>},
50-
{<<"katana_code">>, <<"AE3BBACA187511588F69695A9FF22251CB2CC672FDCCC180289779BDD25175EF">>},
50+
{<<"katana_code">>, <<"0680F33525B9A882E6F4D3022518B15C46F648BD7B0DBE86900980FE1C291404">>},
5151
{<<"providers">>, <<"E45745ADE9C476A9A469EA0840E418AB19360DC44F01A233304E118A44486BA0">>},
5252
{<<"quickrand">>, <<"B8ACBF89A224BC217C3070CA8BEBC6EB236DBE7F9767993B274084EA044D35F0">>},
5353
{<<"rebar3_format">>, <<"CA8FF27638C2169593D1449DACBE8895634193ED3334E906B54FC97F081F5213">>},

0 commit comments

Comments
 (0)