Skip to content

Commit 8238abf

Browse files
committed
chore: upgrade CI to elixir 1.15 and otp 26.1
Signed-off-by: Yordis Prieto <[email protected]>
1 parent 40966e5 commit 8238abf

File tree

10 files changed

+41
-22
lines changed

10 files changed

+41
-22
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
- name: Set up Elixir
1414
uses: erlef/setup-beam@v1
1515
with:
16-
elixir-version: '1.13'
17-
otp-version: '24.3'
16+
version-file: .tool-versions
17+
version-type: strict
1818
- name: Restore dependencies cache
1919
uses: actions/cache@v4
2020
with:

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
strategy:
1010
matrix:
1111
elixir:
12-
- 1.14
13-
- 1.13
12+
- 1.16
13+
- 1.15
1414
otp:
15+
- 26.2
1516
- 25.3
16-
- 24.3
1717
steps:
1818
- uses: actions/checkout@v4
1919
- name: Set up Elixir
@@ -83,8 +83,8 @@ jobs:
8383
- name: Set up Elixir
8484
uses: erlef/setup-beam@v1
8585
with:
86-
elixir-version: '1.13'
87-
otp-version: '24.3'
86+
elixir-version: '1.15'
87+
otp-version: '26.1'
8888
version-type: strict
8989
- name: Restore dependencies cache
9090
uses: actions/cache@v4

.tool-versions

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
elixir 1.16.2
2+
erlang 26.2.3

lib/tesla/adapter/hackney.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ if Code.ensure_loaded?(:hackney) do
7272
end
7373

7474
defp request(method, url, headers, body, opts) do
75-
handle(:hackney.request(method, url, headers, body || '', opts), opts)
75+
handle(:hackney.request(method, url, headers, body || ~c"", opts), opts)
7676
end
7777

7878
defp request_stream(method, url, headers, body, opts) do

lib/tesla/adapter/httpc.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ defmodule Tesla.Adapter.Httpc do
8080
headers = for {key, value} <- headers, do: {to_charlist(key), to_charlist(value)}
8181

8282
{content_type, headers} =
83-
case List.keytake(headers, 'content-type', 0) do
84-
nil -> {'text/plain', headers}
83+
case List.keytake(headers, ~c"content-type", 0) do
84+
nil -> {~c"text/plain", headers}
8585
{{_, ct}, headers} -> {ct, headers}
8686
end
8787

test/support/adapter_case/ssl.ex

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ defmodule Tesla.AdapterCase.SSL do
55

66
describe "SSL" do
77
test "GET request" do
8-
request = %Env{
9-
method: :get,
10-
url: "#{@https}/ip"
11-
}
12-
8+
request = %Env{method: :get, url: "#{@https}/ip"}
139
assert {:ok, %Env{} = response} = call(request, unquote(opts))
1410
assert response.status == 200
1511
end

test/support/test_support.ex

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,28 @@ defmodule TestSupport do
44
|> Enum.map_join("|", fn {key, value} -> "#{key}: #{value}" end)
55
|> :zlib.gzip()
66
end
7+
8+
def ssl_opts(opts) do
9+
Keyword.put_new(
10+
opts,
11+
:cacertfile,
12+
Path.join([to_string(:code.priv_dir(:httparrot)), "/ssl/server-ca.crt"])
13+
)
14+
end
15+
16+
# case String.to_integer(System.otp_release()) do
17+
# n when n >= 25 ->
18+
# def ssl_opts(opts) do
19+
# Keyword.put_new(opts, :cacerts, :public_key.cacerts_get())
20+
# end
21+
22+
# _ ->
23+
# def ssl_opts(opts) do
24+
# Keyword.put_new(
25+
# opts,
26+
# :cacertfile,
27+
# Path.join([to_string(:code.priv_dir(:httparrot)), "/ssl/server-ca.crt"])
28+
# )
29+
# end
30+
# end
731
end

test/tesla/adapter/httpc_test.exs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ defmodule Tesla.Adapter.HttpcTest do
77
use Tesla.AdapterCase.StreamRequestBody
88

99
use Tesla.AdapterCase.SSL,
10-
ssl: [
11-
verify: :verify_peer,
12-
cacertfile: Path.join([to_string(:code.priv_dir(:httparrot)), "/ssl/server-ca.crt"])
13-
]
10+
ssl: TestSupport.ssl_opts(verify: :verify_peer)
1411

1512
# see https://github.com/teamon/tesla/issues/147
1613
test "Set content-type for DELETE requests" do

test/tesla/adapter/mint_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ defmodule Tesla.Adapter.MintTest do
88

99
use Tesla.AdapterCase.SSL,
1010
transport_opts: [
11-
cacertfile: Path.join([to_string(:code.priv_dir(:httparrot)), "/ssl/server-ca.crt"])
11+
cacertfile: TestSupport.cacertfile()
1212
]
1313

1414
test "timeout request" do

test/tesla/middleware/timeout_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ defmodule Tesla.Middleware.TimeoutTest do
115115
[{last_module, _, _, file_info} | _] = __STACKTRACE__
116116

117117
assert Tesla.Middleware.TimeoutTest.Client == last_module
118-
assert file_info[:file] == 'lib/tesla/builder.ex'
118+
assert file_info[:file] == ~c"lib/tesla/builder.ex"
119119
assert file_info[:line] == 23
120120
else
121121
_ ->
@@ -131,7 +131,7 @@ defmodule Tesla.Middleware.TimeoutTest do
131131
[_, {timeout_module, _, _, module_file_info} | _] = __STACKTRACE__
132132

133133
assert Tesla.Middleware.Timeout == timeout_module
134-
assert module_file_info == [file: 'lib/tesla/middleware/timeout.ex', line: 59]
134+
assert module_file_info == [file: ~c"lib/tesla/middleware/timeout.ex", line: 59]
135135
else
136136
_ ->
137137
flunk("Expected exception to be thrown")

0 commit comments

Comments
 (0)