Skip to content

Commit

Permalink
ci: Add Elixir v1.15 to the build matrix (#571)
Browse files Browse the repository at this point in the history
* ci: Add Elixir v1.15 to the build matrix
* Bump more versions, fix latest being present twice, remove exception

---------

Co-authored-by: Benedikt Reinartz <[email protected]>
  • Loading branch information
evnu and filmor authored Oct 20, 2023
1 parent a82d942 commit 85582eb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
- name: Install Erlang/Elixir
uses: erlef/setup-beam@v1
with:
otp-version: "25"
elixir-version: "1.14"
otp-version: "26"
elixir-version: "1.15"

- name: Check cargo fmt
run: cargo fmt --all -- --check
Expand Down Expand Up @@ -85,7 +85,8 @@ jobs:
strategy:
matrix:
pair:
- { erlang: "26", elixir: "1.14", latest: true }
- { erlang: "26", elixir: "1.15", latest: true }
- { erlang: "26", elixir: "1.14" }
- { erlang: "25", elixir: "1.14" }
- { erlang: "24", elixir: "1.13" }
rust:
Expand All @@ -95,11 +96,6 @@ jobs:
- macos
- windows
- ubuntu
exclude:
# TODO Remove this once setup-beam is fixed to work around OTP26's
# regression
- os: windows
pair: { erlang: "26", elixir: "1.14", latest: true }
runs-on: ${{matrix.os}}-latest

steps:
Expand Down
2 changes: 1 addition & 1 deletion rustler_tests/lib/rustler_test.ex
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ defmodule RustlerTest do

def term_debug_and_reparse(term) do
with debug_str <- term_debug(term),
debug_str <- :erlang.binary_to_list(debug_str) ++ '.',
debug_str <- :erlang.binary_to_list(debug_str) ++ ~c".",
{:ok, tokens, _} <- :erl_scan.string(debug_str),
{:ok, ast} <- :erl_parse.parse_exprs(tokens),
{:value, res, _} <- :erl_eval.exprs(ast, %{}) do
Expand Down
2 changes: 1 addition & 1 deletion rustler_tests/test/codegen_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ defmodule RustlerTest.CodegenTest do
end

test "with invalid struct" do
value = %AddException{message: 'this is a charlist', loc: {106, 15}}
value = %AddException{message: ~c"this is a charlist", loc: {106, 15}}

assert_raise ErlangError,
"Erlang error: \"Could not decode field :message on %AddException{}\"",
Expand Down

0 comments on commit 85582eb

Please sign in to comment.