Skip to content

Commit 030c6e4

Browse files
authored
[Rootfs] Promote experimental platforms to non-experimental (#202)
* [Rootfs] Make `supported_platforms(;experimental=true)` the default * [Rootfs] Promote experimental platforms to non-experimental
1 parent e1345f7 commit 030c6e4

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "BinaryBuilderBase"
22
uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
33
authors = ["Elliot Saba <staticfloat@gmail.com>"]
4-
version = "1.2.2"
4+
version = "1.3.0"
55

66
[deps]
77
CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"

src/Rootfs.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -649,11 +649,13 @@ end
649649
choose_shards(::AnyPlatform; kwargs...) = choose_shards(default_host_platform; kwargs...)
650650

651651
"""
652-
supported_platforms(;exclude::Union{Vector{<:Platform},Function}=x->false)
652+
supported_platforms(;exclude::Union{Vector{<:Platform},Function}=x->false,
653+
experimental::Bool=false)
653654
654655
Return the list of supported platforms as an array of `Platform`s. These are the platforms we
655656
officially support building for, if you see a mapping in `get_shard_hash()` that isn't
656-
represented here, it's probably because that platform is still considered "in beta".
657+
represented here, it's probably because that platform is still considered "in beta". If
658+
`experimental=true`, include platforms considered experimental.
657659
658660
Platforms can be excluded from the list by specifying an array of platforms to `exclude` i.e.
659661
`supported_platforms(exclude=[Platform("i686", "windows"), Platform("x86_64", "windows")])`
@@ -663,27 +665,28 @@ supported_platforms(exclude=Sys.islinux)
663665
```
664666
"""
665667
function supported_platforms(;exclude::Union{Vector{<:Platform},Function}=x->false,
666-
experimental::Bool=false)
668+
experimental::Bool=false)
667669
exclude_platforms!(platforms, exclude::Function) = filter(!exclude, platforms)
668670
exclude_platforms!(platforms, exclude::Vector{<:Platform}) = filter!(!in(exclude), platforms)
669671
standard_platforms = [
670672
# glibc Linuces
671673
Platform("i686", "linux"),
672674
Platform("x86_64", "linux"),
673675
Platform("aarch64", "linux"),
674-
# Platform("armv6l", "linux"),
676+
Platform("armv6l", "linux"),
675677
Platform("armv7l", "linux"),
676678
Platform("powerpc64le", "linux"),
677679

678680
# musl Linuces
679681
Platform("i686", "linux"; libc="musl"),
680682
Platform("x86_64", "linux"; libc="musl"),
681683
Platform("aarch64", "linux"; libc="musl"),
682-
# Platform("armv6l", "linux"; libc="musl"),
684+
Platform("armv6l", "linux"; libc="musl"),
683685
Platform("armv7l", "linux"; libc="musl"),
684686

685687
# BSDs
686688
Platform("x86_64", "macos"),
689+
Platform("aarch64", "macos"),
687690
Platform("x86_64", "freebsd"),
688691

689692
# Windows
@@ -694,9 +697,6 @@ function supported_platforms(;exclude::Union{Vector{<:Platform},Function}=x->fal
694697
# We have experimental support for some platforms, allow easily including them
695698
if experimental
696699
append!(standard_platforms, [
697-
Platform("aarch64", "macos"),
698-
Platform("armv6l", "linux"),
699-
Platform("armv6l", "linux"; libc="musl"),
700700
])
701701
end
702702
return exclude_platforms!(standard_platforms,exclude)

test/rootfs.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ using BinaryBuilderBase
6262
Platform("aarch64", "linux"; libc="glibc", march="armv8_1"),
6363
Platform("aarch64", "linux"; libc="glibc", march="armv8_2_crypto"),
6464
Platform("aarch64", "linux"; libc="glibc", march="armv8_4_crypto_sve"),
65-
# Platform("armv6l", "linux"; libc="glibc", call_abi="eabihf", march="arm1176jzfs"),
65+
Platform("armv6l", "linux"; libc="glibc", call_abi="eabihf", march="arm1176jzfs"),
6666
Platform("armv7l", "linux"; libc="glibc", call_abi="eabihf", march="armv7l"),
6767
Platform("armv7l", "linux"; libc="glibc", call_abi="eabihf", march="neonvfpv4"),
6868
Platform("i686", "linux"; libc="glibc", march="pentium4"),

0 commit comments

Comments
 (0)