Skip to content
This repository has been archived by the owner on Aug 12, 2022. It is now read-only.

Commit

Permalink
Clean up the log (#13367)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
andreasnoack authored Feb 20, 2018
1 parent 8a35a42 commit 019150c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
10 changes: 9 additions & 1 deletion .test/METADATA.jl
Original file line number Diff line number Diff line change
@@ -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"^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?"
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .test/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 019150c

Please sign in to comment.