Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions Artifacts.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2044,6 +2044,28 @@ os = "linux"
sha256 = "b8488f009c117eb7135b2ac139009836518587aacea772eba83271c794afa420"
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/Go-v1.13.0+0/Go.v1.13.0.x86_64-linux-musl.unpacked.tar.gz"

[["Go.v1.16.3.x86_64-linux-musl.squashfs"]]
arch = "x86_64"
git-tree-sha1 = "3a85d82c6b7bb04cc5fd9c206a40071a85a8ab33"
lazy = true
libc = "musl"
os = "linux"

[["Go.v1.16.3.x86_64-linux-musl.squashfs".download]]
sha256 = "3c51d29fc653f41c8e4a9fa52444deefc984e146426db7e87065ebb50a129a0a"
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/Go-v1.16.3/Go.v1.16.3.x86_64-linux-musl.squashfs.tar.gz"

[["Go.v1.16.3.x86_64-linux-musl.unpacked"]]
arch = "x86_64"
git-tree-sha1 = "899505c8af5679696acf1b476a16b5696f5caf24"
lazy = true
libc = "musl"
os = "linux"

[["Go.v1.16.3.x86_64-linux-musl.unpacked".download]]
sha256 = "a5b4ad9807ad4c16a8df91ebc763d75b766edeed12a83f2f608a38081f53e82e"
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/Go-v1.16.3/Go.v1.16.3.x86_64-linux-musl.unpacked.tar.gz"

[["LLVMBootstrap.v11.0.1.x86_64-linux-musl.squashfs"]]
arch = "x86_64"
git-tree-sha1 = "5ab848b00d11e579786ffcca46f2ab0173e30d48"
Expand Down
8 changes: 4 additions & 4 deletions src/Rootfs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ using Base.BinaryPlatforms: set_compare_strategy!, compare_version_cap
struct CompilerShard
# Something like "RootFS", or "GCCBootstrap"
name::String

# Something like v"7.1.0"
version::VersionNumber

Expand All @@ -17,7 +17,7 @@ struct CompilerShard

# Usually `default_host_platform`
host::AbstractPlatform

# :unpacked or :squashfs. Possibly more in the future.
archive_type::Symbol

Expand Down Expand Up @@ -151,7 +151,7 @@ function shard_path(cs::CompilerShard; uid = getuid())
# as artifacts are retired, and also for multiple users to share a scratchspace.
return joinpath(@get_scratch!(bytes2hex(hash.bytes)), "$(artifact_name(cs))_$(getuid()).squashfs")
end

return artifact_path(hash)
end

Expand Down Expand Up @@ -498,7 +498,7 @@ function choose_shards(p::AbstractPlatform;
GCC_builds::Vector{GCCBuild}=available_gcc_builds,
LLVM_builds::Vector{LLVMBuild}=available_llvm_builds,
Rust_build::VersionNumber=v"1.43.0",
Go_build::VersionNumber=v"1.13",
Go_build::VersionNumber=v"1.16.3",
archive_type::Symbol = (use_squashfs ? :squashfs : :unpacked),
bootstrap_list::Vector{Symbol} = bootstrap_list,
# Because GCC has lots of compatibility issues, we always default to
Expand Down