Skip to content

Commit

Permalink
Merge 33dcbe3 into 39bce62
Browse files Browse the repository at this point in the history
  • Loading branch information
chkwon committed Aug 13, 2018
2 parents 39bce62 + 33dcbe3 commit 2e78360
Show file tree
Hide file tree
Showing 8 changed files with 143 additions and 115 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ os:
- linux
- osx
julia:
- 0.6
- 0.7
- 1.0
- nightly
matrix:
allow_failures:
Expand All @@ -18,7 +19,7 @@ addons:
- gfortran
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia -e 'Pkg.init(); Pkg.clone(pwd()); Pkg.build("PATHSolver"); Pkg.build("PATHSolver"); Pkg.test("PATHSolver", coverage=true)'
- julia -e 'using Pkg; Pkg.clone(pwd()); Pkg.build("PATHSolver"); Pkg.build("PATHSolver"); Pkg.test("PATHSolver", coverage=true)'
after_success:
- echo $TRAVIS_JULIA_VERSION
- julia -e 'cd(Pkg.dir("PATHSolver")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
- julia -e 'using Pkg; cd(Pkg.dir("PATHSolver")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
4 changes: 2 additions & 2 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
julia 0.6
julia 0.7
ForwardDiff 0.7
BinDeps
BinDeps 0.8
FunctionWrappers 0.1
10 changes: 6 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
environment:
matrix:
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/1.0/julia-1.0-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/1.0/julia-1.0-latest-win64.exe"
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"

Expand Down Expand Up @@ -35,7 +37,7 @@ build_script:
# Need to convert from shallow to complete for Pkg.clone to work
- IF EXIST .git\shallow (git fetch --unshallow)
- C:\projects\julia\bin\julia -e "versioninfo();
Pkg.clone(pwd(), \"PATHSolver\"); Pkg.build(\"PATHSolver\")"
using Pkg; Pkg.clone(pwd(), \"PATHSolver\"); Pkg.build(\"PATHSolver\")"

test_script:
- C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"PATHSolver\")"
- C:\projects\julia\bin\julia --check-bounds=yes -e "using Pkg; Pkg.test(\"PATHSolver\")"
1 change: 1 addition & 0 deletions deps/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ usr
deps.jl
PathJulia*
pathlib*
build.log
4 changes: 2 additions & 2 deletions deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ provides(BuildProcess,



@static if is_windows()
@static if Sys.iswindows()
push!(BinDeps.defaults, BuildProcess)
end

@BinDeps.install Dict(:libpath47julia => :libpath47julia)

@static if is_windows()
@static if Sys.iswindows()
pop!(BinDeps.defaults)
end

0 comments on commit 2e78360

Please sign in to comment.