stuff

Author: DilumAluthge

src/VersionsJSONUtil.jl

@@ -478,22 +478,20 @@ function main!(content::OutputJsonContent, cfg::Config)
                 else
                     error("Unsupported file extension in filename: $(filename)")
                 end
+                new_etag = get_new_etag_for_url(url)
+
                 file_dict = OrderedDict{String, Union{String, Int}}()
+                file_dict["arch"] = string(arch(platform))
                 file_dict["triplet"] = triplet(platform)
                 file_dict["os"] = meta_os(platform)
-                file_dict["arch"] = string(arch(platform))
                 file_dict["version"] = string(version)
                 file_dict["sha256"] = tarball_hash
                 file_dict["size"] = filesize(filepath)
                 file_dict["kind"] = kind
                 file_dict["extension"] = extension
                 file_dict["url"] = url
 
-                new_etag = get_new_etag_for_url(url)
-                if isnothing(new_etag)
-                    @warn "Failed to get new ETag for URL: $url"
-                    return false
-                else
+                if !isnothing(new_etag)
                     file_dict["etag"] = new_etag
                 end
 
@@ -502,6 +500,7 @@ function main!(content::OutputJsonContent, cfg::Config)
                 push!(meta[string(version)]["files"], file_dict)
 
                 # Write out new versions of our versions.json as we go
+                sort!(file_dict)
                 checkpoint(content, cfg)
 
                 # Delete downloaded file
@@ -543,6 +542,9 @@ function main!(content::OutputJsonContent, cfg::Config)
                 # Add in `.asc` signature content, if applicable
                 if !isnothing(asc_signature)
                     file_dict["asc"] = asc_signature
+
+                    # Explicitly sort file_dict
+                    sort!(file_dict)
                     checkpoint(content, cfg)
                 end
             end