Skip to content

Commit 422c96e

Browse files
committed
Handle issues with Travis/Appveyor having old builds of Julia, without coalesce => something change
1 parent 9efdfc3 commit 422c96e

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

.travis.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ git:
1313

1414
## uncomment the following lines to allow failures on nightly julia
1515
## (tests will run but not make your overall status red)
16-
matrix:
17-
allow_failures:
18-
- julia: nightly
16+
#matrix:
17+
# allow_failures:
18+
# - julia: nightly
1919

2020
## uncomment and modify the following lines to manually install system packages
2121
#addons:
@@ -27,9 +27,9 @@ matrix:
2727

2828
## uncomment the following lines to override the default test script
2929
script:
30-
- julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg) ; if VERSION < v"0.7.0-DEV.5183" ; Pkg.clone(pwd()) ; else ; Pkg.up() ; end ; Pkg.test("ModuleInterfaceTools"; coverage=true)'
30+
- julia -e 'if VERSION < v"0.7.0-DEV.5183" ; Pkg.clone(pwd()) ; else ; Pkg.up() ; end ; Pkg.test("ModuleInterfaceTools"; coverage=true)'
3131
after_success:
3232
# push coverage results to Coveralls
33-
- julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("ModuleInterfaceTools")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
33+
- julia -e 'cd(Pkg.dir("ModuleInterfaceTools")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
3434
# push coverage results to Codecov
35-
- julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("ModuleInterfaceTools")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
35+
- julia -e 'cd(Pkg.dir("ModuleInterfaceTools")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

appveyor.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ environment:
77

88
## uncomment the following lines to allow failures on nightly julia
99
## (tests will run but not make your overall status red)
10-
matrix:
11-
allow_failures:
12-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
13-
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
10+
#matrix:
11+
# allow_failures:
12+
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
13+
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
1414

1515
branches:
1616
only:
@@ -40,11 +40,11 @@ install:
4040
build_script:
4141
# Need to convert from shallow to complete for Pkg.clone to work
4242
- IF EXIST .git\shallow (git fetch --unshallow)
43-
- C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using Pkg, InteractiveUtils);
43+
- C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using InteractiveUtils);
4444
versioninfo();
4545
if VERSION < v\"0.7.0-DEV.5183\";
4646
Pkg.clone(pwd(), \"ModuleInterfaceTools\");
4747
else; Pkg.up(); end"
4848

4949
test_script:
50-
- C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using Pkg); Pkg.test(\"ModuleInterfaceTools\")"
50+
- C:\projects\julia\bin\julia -e "Pkg.test(\"ModuleInterfaceTools\")"

src/ModuleInterfaceTools.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ const _cmduse = (:use, :test, :extend, :export, :list)
117117
const _cmdadd =
118118
(:modules, :public, :develop, :public!, :develop!, :base, :base!)
119119

120-
@static V6_COMPAT && (const _ff = findfirst)
121-
@static V6_COMPAT || (_ff(lst, val) = something(findfirst(isequal(val), lst), 0))
120+
@static V6_COMPAT ? (const _ff = findfirst) :
121+
(_ff(lst, val) = (ret = findfirst(isequal(val), lst); ret === nothing ? 0 : ret))
122122

123123
function _add_def!(curmod, grp, exp)
124124
debug[] && print("_add_def!($curmod, $grp, $exp::$(typeof(exp))")

0 commit comments

Comments
 (0)