Skip to content

Commit

Permalink
Remove FreeBSD target from default target list
Browse files Browse the repository at this point in the history
  • Loading branch information
philss committed Jun 22, 2023
1 parent 4302eba commit e6d1304
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 2 additions & 4 deletions lib/rustler_precompiled/config.ex
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions test/rustler_precompiled/config_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 5 additions & 2 deletions test/rustler_precompiled_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()

Expand Down

0 comments on commit e6d1304

Please sign in to comment.