From 019150cd503b6d26348e33dbe20259f172dcd880 Mon Sep 17 00:00:00 2001 From: Andreas Noack Date: Tue, 20 Feb 2018 08:52:57 +0100 Subject: [PATCH] Clean up the log (#13367) * In Julia 0.7, findfirst returns nothing when no results are found * Silence Pkg deprecation to see if test will then finish * Don't fork the processes. It messes up the output --- .test/METADATA.jl | 10 +++++++++- .test/ci.sh | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.test/METADATA.jl b/.test/METADATA.jl index e05844cf907..68c0ea5c59f 100644 --- a/.test/METADATA.jl +++ b/.test/METADATA.jl @@ -1,3 +1,9 @@ +@static if VERSION < v"0.7.0-DEV.3656" + const Pkg = Base.Pkg +else + import Pkg +end + cd(Pkg.dir()) # Required by some Pkg functions const url_reg = r"^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?" @@ -153,7 +159,9 @@ for (pkg, versions) in Pkg.Read.available() same_minor(x::VersionNumber) = (majmin(x) == majmin(ver) && juliaver_in_require(pkg, x; check=false) < juliaver) ind_same_minor = findfirst(same_minor, sortedversions) - ind_same_minor == 0 && continue + if ind_same_minor == (VERSION < v"0.7.0-DEV.3399" ? 0 : nothing) + continue + end first_same_minor = sortedversions[ind_same_minor] juliaver_prev = juliaver_in_require(pkg, first_same_minor; check=false) if majmin(juliaver) > majmin(juliaver_prev) diff --git a/.test/ci.sh b/.test/ci.sh index 61e33c0d88a..a820ffb38af 100644 --- a/.test/ci.sh +++ b/.test/ci.sh @@ -27,7 +27,7 @@ for ver in 0.5 0.6 nightly; do curl -A "$CI_NAME for METADATA tests $(curl --version | head -n 1)" -L --retry 5 $url | \ tar -C julia-$ver --strip-components=1 -xzf - && \ julia-$ver/bin/julia -e 'versioninfo(); include("$(ENV["BUILD_DIR"])/.test/METADATA.jl")' && \ - touch success-$ver & + touch success-$ver done wait if ! [ -e success-0.5 -a -e success-0.6 ]; then # nightly allowed to fail