Skip to content

Commit 63b3a4f

Browse files
authored
Merge pull request #8 from omus/cv/1.0-compat
Test against Julia 1.0
2 parents 89cd2f1 + 5a4f3d0 commit 63b3a4f

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@ os:
66
julia:
77
- 0.6
88
- 0.7
9+
- 1.0
910
- nightly
1011
notifications:
1112
email: false
1213
matrix:
1314
fast_finish: true
1415
after_success:
15-
- julia -e 'cd(Pkg.dir("FilePathsBase")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
16+
- |
17+
julia -e '
18+
VERSION >= v"0.7.0-DEV.3656" && using Pkg
19+
VERSION >= v"0.7.0-DEV.5183" || cd(Pkg.dir("FilePathsBase"))
20+
Pkg.add("Coverage"); using Coverage
21+
Codecov.submit(process_folder())'

appveyor.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ environment:
22
matrix:
33
- julia_version: 0.6
44
- julia_version: 0.7
5+
- julia_version: 1
56
- julia_version: latest
67

78
platform:
@@ -26,12 +27,12 @@ notifications:
2627
on_build_status_changed: false
2728

2829
install:
29-
- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/master/bin/install.ps1'))
30+
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
3031

3132
build_script:
3233
- echo "%JL_BUILD_SCRIPT%"
33-
- julia -e "%JL_BUILD_SCRIPT%"
34+
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
3435

3536
test_script:
3637
- echo "%JL_TEST_SCRIPT%"
37-
- julia -e "%JL_TEST_SCRIPT%"
38+
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

src/path.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ function Base.chmod(path::AbstractPath, symbolic_mode::AbstractString; recursive
701701
end
702702
end
703703

704-
Base.read(path::AbstractPath) = open(readstring, String(path))
704+
Base.read(path::AbstractPath) = read(String(path), String)
705705

706706
function Base.write(path::AbstractPath, content::AbstractString, mode="w")
707707
open(String(path), mode) do f

0 commit comments

Comments
 (0)