From c0c95a1a38ea1c81a16b3c9e90aff1f25a92b6ac Mon Sep 17 00:00:00 2001 From: Ben Youngblood Date: Tue, 20 Jun 2023 12:34:31 -0700 Subject: [PATCH] Add Elixir 1.15.0-otp-26 to CI --- .circleci/config.yml | 6 +++--- .tool-versions | 2 ++ lib/grizzly/autocomplete.ex | 6 +++--- lib/grizzly/transports/DTLS.ex | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 .tool-versions diff --git a/.circleci/config.yml b/.circleci/config.yml index e3a99eec..b1bd6a6f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,9 +19,9 @@ install_system_deps: &install_system_deps apk add build-base jobs: - build_elixir_1_14_otp_26: + build_elixir_1_15_otp_26: docker: - - image: hexpm/elixir:1.14.4-erlang-26.0-alpine-3.18.0 + - image: hexpm/elixir:1.15.0-erlang-26.0.1-alpine-3.18.2 <<: *defaults steps: - checkout @@ -76,6 +76,6 @@ workflows: version: 2 build_test: jobs: - - build_elixir_1_14_otp_26 + - build_elixir_1_15_otp_26 - build_elixir_1_14_otp_25 - build_elixir_1_13_otp_25 diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 00000000..0f11382c --- /dev/null +++ b/.tool-versions @@ -0,0 +1,2 @@ +elixir 1.15.2-otp-26 +erlang 26.0.2 diff --git a/lib/grizzly/autocomplete.ex b/lib/grizzly/autocomplete.ex index 3a4169da..70bb7d18 100644 --- a/lib/grizzly/autocomplete.ex +++ b/lib/grizzly/autocomplete.ex @@ -34,10 +34,10 @@ defmodule Grizzly.Autocomplete do case expansions do [] -> - {:no, '', []} + {:no, ~c"", []} [^command_prefix] -> - {:no, '', []} + {:no, ~c"", []} [unique] -> completion = unique |> String.to_charlist() |> Enum.drop(prefix_len) @@ -71,7 +71,7 @@ defmodule Grizzly.Autocomplete do def remsh(node) do fn e -> case :rpc.call(node, Grizzly.Autocomplete, :expand, [e]) do - {:badrpc, _} -> {:no, '', []} + {:badrpc, _} -> {:no, ~c"", []} r -> r end end diff --git a/lib/grizzly/transports/DTLS.ex b/lib/grizzly/transports/DTLS.ex index c8361164..5771a01a 100644 --- a/lib/grizzly/transports/DTLS.ex +++ b/lib/grizzly/transports/DTLS.ex @@ -217,7 +217,7 @@ defmodule Grizzly.Transports.DTLS do {:versions, [:"dtlsv1.2", :dtlsv1]}, {:protocol, :dtls}, {:ciphers, [{:psk, :aes_128_cbc, :sha}]}, - {:psk_identity, 'Client_identity'}, + {:psk_identity, ~c"Client_identity"}, {:user_lookup_fun, {&user_lookup/3, <<0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78,