Merge branch 'master' into tb/llvmbootstrap

Author: giordano

.github/workflows/ci.yml

@@ -66,9 +66,13 @@ jobs:
             squashfs: true
             julia-version: "1.11"
 
-          # - runner: privileged
-          #   squashfs: true
-          #   julia-version: "nightly"
+          - runner: privileged
+            squashfs: true
+            julia-version: "1.12-nightly"
+
+          - runner: privileged
+            squashfs: true
+            julia-version: "nightly"
 
           # Add a job that uses the unprivileged builder with unpacked shards
           - runner: unprivileged

Artifacts.toml

@@ -1,7 +1,7 @@
 name = "BinaryBuilderBase"
 uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
 authors = ["Elliot Saba <[email protected]>"]
-version = "1.38.0"
+version = "1.41.0"
 
 [deps]
 Bzip2_jll = "6e34b625-4abd-537c-b88f-471c36dfa7a0"

Project.toml

@@ -1,6 +1,7 @@
 using Base: SHA1
 using Downloads, Tar, p7zip_jll, pigz_jll, SimpleBufferStream, SHA
 using Pkg.Artifacts: artifact_exists, artifact_path, query_override
+using XZ_jll: xz
 
 export unpack, list_tarball_files, verify, download_verify
 
@@ -146,14 +147,16 @@ end
 # function
 function archive_artifact(hash::SHA1, tarball_path::String;
                           honor_overrides::Bool=false,
-                          package::Function=package)
+                          package::Function=package,
+                          compression_format::String="gzip",
+                          )
 
     if !artifact_exists(hash)
         error("Unable to archive artifact $(bytes2hex(hash.bytes)): does not exist!")
     end
 
     # Package it up
-    package(artifact_path(hash), tarball_path)
+    package(artifact_path(hash), tarball_path; format=compression_format)
 
     # Calculate its sha256 and return that
     return open(tarball_path, "r") do io
@@ -170,6 +173,8 @@ function package(src_dir::AbstractString, tarball_path::AbstractString;
     # does not.
     compress_cmd = if format == "gzip"
         pipeline(`$(pigz()) --no-time --no-name -9`, stdout=tarball_path)
+    elseif format == "xz"
+        pipeline(`$(xz()) -T0 -9`; stdout=tarball_path)
     else
         pipeline(`$(p7zip()) a -si -t$format -mx9 $tarball_path`, stdout=devnull)
     end

src/ArchiveUtils.jl

@@ -332,6 +332,9 @@ patch(v::VersionNumber) = v.patch
 major(v::Pkg.Types.VersionBound) = v.t[1]
 minor(v::Pkg.Types.VersionBound) = v.t[2]
 patch(v::Pkg.Types.VersionBound) = v.t[3]
+
+# If a version in a PackageSpec is given as a string it signifies being a VersionSpec that Pkg will handle as such.
+__version(v::AbstractString) = __version(PKG_VERSIONS.VersionSpec(v))
 __version(v::VersionNumber) = v
 __version(v::PKG_VERSIONS.VersionSpec) = v.ranges[1].lower
 version(d::AbstractDependency) = __version(getpkg(d).version)