From e6d1304bb3f79fc261c18444406a2595efd95d3a Mon Sep 17 00:00:00 2001 From: Philip Sampaio Date: Thu, 22 Jun 2023 16:11:36 -0300 Subject: [PATCH] Remove FreeBSD target from default target list --- lib/rustler_precompiled/config.ex | 6 ++---- test/rustler_precompiled/config_test.exs | 3 +-- test/rustler_precompiled_test.exs | 7 +++++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/rustler_precompiled/config.ex b/lib/rustler_precompiled/config.ex index 73500eb..4391c62 100644 --- a/lib/rustler_precompiled/config.ex +++ b/lib/rustler_precompiled/config.ex @@ -1,8 +1,6 @@ defmodule RustlerPrecompiled.Config do @moduledoc false - alias __MODULE__.AvailableTargets - # This is an internal struct to represent valid config options. defstruct [ :otp_app, @@ -28,13 +26,13 @@ defmodule RustlerPrecompiled.Config do x86_64-pc-windows-msvc x86_64-unknown-linux-gnu x86_64-unknown-linux-musl - x86_64-unknown-freebsd ) @available_nif_versions ~w(2.14 2.15 2.16) @default_nif_versions ~w(2.15 2.16) def default_targets, do: @default_targets + def available_targets, do: RustlerPrecompiled.Config.AvailableTargets.list() def available_nif_versions, do: @available_nif_versions def default_nif_versions, do: @default_nif_versions @@ -47,7 +45,7 @@ defmodule RustlerPrecompiled.Config do targets = opts |> Keyword.get(:targets, @default_targets) - |> validate_list!(:targets, AvailableTargets.list()) + |> validate_list!(:targets, available_targets()) nif_versions = opts diff --git a/test/rustler_precompiled/config_test.exs b/test/rustler_precompiled/config_test.exs index b76702a..616c64a 100644 --- a/test/rustler_precompiled/config_test.exs +++ b/test/rustler_precompiled/config_test.exs @@ -104,8 +104,7 @@ defmodule RustlerPrecompiled.ConfigTest do "x86_64-pc-windows-gnu", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", - "x86_64-unknown-linux-musl", - "x86_64-unknown-freebsd" + "x86_64-unknown-linux-musl" ] end diff --git a/test/rustler_precompiled_test.exs b/test/rustler_precompiled_test.exs index 75692eb..6fdf848 100644 --- a/test/rustler_precompiled_test.exs +++ b/test/rustler_precompiled_test.exs @@ -177,7 +177,11 @@ defmodule RustlerPrecompiledTest do } assert {:ok, "nif-2.16-x86_64-unknown-freebsd"} = - RustlerPrecompiled.target(config, @available_targets, @available_nif_versions) + RustlerPrecompiled.target( + config, + RustlerPrecompiled.Config.available_targets(), + @available_nif_versions + ) end test "without specified available_targets or available_nif_versions" do @@ -211,7 +215,6 @@ defmodule RustlerPrecompiledTest do - x86_64-pc-windows-msvc - x86_64-unknown-linux-gnu - x86_64-unknown-linux-musl - - x86_64-unknown-freebsd """ |> String.trim()