STDLIBS_BY_VERSION: Check sorted & require same minor (#4414)

Author: IanButterworth

src/Types.jl

@@ -557,12 +557,23 @@ function get_last_stdlibs(julia_version::VersionNumber; use_historical_for_curre
     end
     historical_stdlibs_check()
     last_stdlibs = UNREGISTERED_STDLIBS
+    last_version = nothing
+
     for (version, stdlibs) in STDLIBS_BY_VERSION
+        if !isnothing(last_version) && last_version > version
+            pkgerror("STDLIBS_BY_VERSION must be sorted by version number")
+        end
         if VersionNumber(julia_version.major, julia_version.minor, julia_version.patch) < version
             break
         end
         last_stdlibs = stdlibs
+        last_version = version
     end
+    # Serving different patches is safe-ish, but different majors or minors is most likely not.
+    if last_version !== nothing && (last_version.major != julia_version.major || last_version.minor != julia_version.minor)
+        pkgerror("Could not find a julia version in STDLIBS_BY_VERSION that matches the major & minor version of requested julia_version v$(julia_version)")
+    end
+
     return last_stdlibs
 end
 # If `julia_version` is set to `nothing`, that means (essentially) treat all registered

test/historical_stdlib_version.jl

@@ -31,10 +31,13 @@ using .Utils
     @test is_stdlib(pkg_uuid)
     @test is_stdlib(pkg_uuid, v"1.0")
     @test is_stdlib(pkg_uuid, v"1.6")
-    @test is_stdlib(pkg_uuid, v"999.999.999")
     @test is_stdlib(pkg_uuid, v"0.7")
     @test is_stdlib(pkg_uuid, nothing)
 
+    # We can't serve information for unknown major.minor versions (patches can not match)
+    @test_throws Pkg.Types.PkgError is_stdlib(pkg_uuid, v"999.999.999")
+    @test is_stdlib(pkg_uuid, v"1.10.999")
+
     # MbedTLS_jll stopped being a stdlib in 1.12
     @test !is_stdlib(mbedtls_jll_uuid)
     @test !is_stdlib(mbedtls_jll_uuid, v"1.12")