Skip to content

Commit

Permalink
Merge 1cee5b2 into ddc8837
Browse files Browse the repository at this point in the history
  • Loading branch information
davidanthoff committed Aug 31, 2018
2 parents ddc8837 + 1cee5b2 commit 68a4519
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 21 deletions.
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ os:
julia:
- 0.7
- 1.0
- nightly
notifications:
email: false
branches:
only:
- master
- /release-.*/
- /v(\d+)\.(\d+)\.(\d+)/
matrix:
allow_failures:
- julia: nightly
addons:
apt:
packages:
Expand All @@ -22,9 +26,9 @@ addons:
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
- $TESTCMD --check-bounds=yes -e 'Pkg.clone(pwd()); Pkg.build("VegaLite"); Pkg.test("VegaLite"; coverage=true)'
- $TESTCMD --check-bounds=yes -e 'using Pkg; Pkg.clone(pwd()); Pkg.build("VegaLite"); Pkg.test("VegaLite"; coverage=true)'
after_success:
- julia -e 'cd(Pkg.dir("VegaLite")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
- julia -e 'cd(Pkg.dir("VegaLite")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
- julia -e 'Pkg.add("Documenter")'
- $TESTCMD -e 'cd(Pkg.dir("VegaLite")); include(joinpath("docs", "make.jl"))'
- julia -e 'cd(Pkg.dir("VegaLite")); include(joinpath("docs", "make.jl"))'
26 changes: 13 additions & 13 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
julia 0.7
JSON
Requires
NodeJS
Cairo
Rsvg
IteratorInterfaceExtensions 0.0.1
TableTraits 0.0.2
IterableTables
FileIO 0.9.1
DataValues
MacroTools
URIParser
FilePaths
JSON 0.19.0
Requires 0.5.2
NodeJS 0.5.1
Cairo 0.5.5
Rsvg 0.2.2
IteratorInterfaceExtensions 0.1.1
TableTraits 0.3.1
IterableTables 0.8.3
FileIO 1.0.0
DataValues 0.4.4
MacroTools 0.4.4
URIParser 0.4.0
FilePaths 0.7.0
9 changes: 4 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@ environment:
matrix:
- julia_version: 0.7
- julia_version: 1.0
- julia_version: nightly

platform:
- x86 # 32-bit
- x64 # 64-bit

## uncomment the following lines to allow failures on nightly julia
## (tests will run but not make your overall status red)
# matrix:
# allow_failures:
# - julia_version: latest
matrix:
allow_failures:
- julia_version: nightly

branches:
only:
Expand Down
2 changes: 1 addition & 1 deletion docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ deploydocs(
make = nothing,
target = "build",
repo = "github.com/fredo-dedup/VegaLite.jl.git",
julia = "0.6"
julia = "1.0"
)

0 comments on commit 68a4519

Please sign in to comment.