Unbreak broken tests (#299)

* Unbreak broken tests

* Fix brand-new broken test

Author: giordano

.github/workflows/ci.yml

@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - run: sudo rm -rf /opt/*
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: julia-actions/setup-julia@v1
         with:
           version: ${{ matrix.julia-version }}
@@ -80,7 +80,7 @@ jobs:
     env:
       JULIA_PKG_SERVER: ""
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: julia-actions/setup-julia@latest
         with:
           version: "1.7"

test/dependencies.jl

@@ -225,20 +225,15 @@ end
             @test "destdir" ∉ readdir(dirname(destdir(dir, platform)))
         end
 
-        # Some tests are broken on nightly because of
-        # https://github.com/JuliaLang/Pkg.jl/issues/3170 and
-        # https://github.com/JuliaLang/Pkg.jl/issues/3181
-        nightly_broken = VERSION ≥ v"1.9.0-DEV"
-
         # Test setup of dependencies that depend on the Julia version
         with_temp_project() do dir
             prefix = Prefix(dir)
             dependencies = [Dependency("GMP_jll")]
             platform = Platform("x86_64", "linux"; julia_version=v"1.5")
 
             # Test that a particular version of GMP is installed
-            @test !isempty(setup_dependencies(prefix, getpkg.(dependencies), platform)) broken=nightly_broken # restore @test_logs when not broken anymore
-            @test isfile(joinpath(destdir(dir, platform), "lib", "libgmp.so.10.3.2")) broken=nightly_broken
+            @test @test_logs !isempty(setup_dependencies(prefix, getpkg.(dependencies), platform))
+            @test isfile(joinpath(destdir(dir, platform), "lib", "libgmp.so.10.3.2"))
         end
 
         # Next, test on Julia v1.6
@@ -262,7 +257,7 @@ end
 
             # Test that this is not instantiatable with either Julia v1.5 or v1.6
             platform = Platform("x86_64", "linux"; julia_version=v"1.5")
-            @test_throws (nightly_broken ? AssertionError : Pkg.Resolve.ResolverError) setup_dependencies(prefix, getpkg.(dependencies), platform)
+            @test_throws Pkg.Resolve.ResolverError setup_dependencies(prefix, getpkg.(dependencies), platform)
             platform = Platform("x86_64", "linux"; julia_version=v"1.6")
             @test_throws Pkg.Resolve.ResolverError setup_dependencies(prefix, getpkg.(dependencies), platform)
 

test/runners.jl

@@ -245,9 +245,10 @@ end
                 # Install `MPICH_jll` in the `${prefix}` to make sure we can link to
                 # libquadmath without problems, see
                 # https://github.com/JuliaPackaging/BinaryBuilderBase.jl/pull/157#issuecomment-879263820
+                version = VERSION≥v"1.9.0-" ? v"3.4.2+0" : v"3.4.2" # From Julia v1.9, JLLs need to specify the build number
                 artifact_paths =
                     setup_dependencies(prefix,
-                                       [PackageSpec(; name="MPICH_jll", version=v"3.4.2")],
+                                       [PackageSpec(; name="MPICH_jll", version)],
                                        concrete_platform, verbose=false)
                 ur = preferred_runner()(prefix.path;
                                         platform=concrete_platform,
@@ -297,9 +298,10 @@ end
                 # Install `CompilerSupportLibraries_jll` v0.5.0 in the `${prefix}` to make
                 # sure it doesn't break compilation of the program for i686-linux-gnu, see
                 # https://github.com/JuliaPackaging/BinaryBuilderBase.jl/issues/163
+                version = VERSION≥v"1.9.0-" ? v"0.5.0+0" : v"0.5.0" # From Julia v1.9, JLLs need to specify the build number
                 artifact_paths =
                     setup_dependencies(prefix,
-                                       [PackageSpec(; name="CompilerSupportLibraries_jll", version=v"0.5.0")],
+                                       [PackageSpec(; name="CompilerSupportLibraries_jll", version)],
                                        concrete_platform, verbose=false)
                 ur = preferred_runner()(prefix.path;
                                         platform=concrete_platform,