Skip to content

Commit

Permalink
Use new Artifacts framework to install binary dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
giordano committed Oct 26, 2019
1 parent fbdef95 commit e783879
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 49 deletions.
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@ os:
- linux
- osx
julia:
- 0.7
- 1.0
- 1.1
- 1.3
- nightly
matrix:
allow_failures:
- julia: nightly
notifications:
email: false

script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia -e 'using Pkg; pkg"add https://github.com/staticfloat/Cairo.jl#sf/jll_pkg"; Pkg.build(verbose=true); Pkg.test(coverage=true)'

after_success:
- julia -e 'using Pkg; cd(Pkg.dir("Rsvg")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
8 changes: 3 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ uuid = "c4c386cf-5103-5370-be45-f3a111cca3b8"
version = "0.3.0"

[deps]
BinDeps = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
Homebrew = "d9be37ee-ecc9-5288-90f1-b9ca67657a75"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
WinRPM = "c17dfb99-b4f7-5aad-8812-456da1ad7187"
Glib_jll = "7746bdde-850d-59dc-9ae8-88ece973131d"
Librsvg_jll = "925c91fb-5dd6-59dd-8e8c-345e74382d89"

[compat]
julia = "0.7, 1"
julia = "1.3"

[extras]
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Expand Down
5 changes: 2 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
environment:
matrix:
- julia_version: 0.7
- julia_version: 1.0
- julia_version: 1.1
- julia_version: 1.3
- julia_version: nightly

platform:
Expand All @@ -28,6 +26,7 @@ install:

build_script:
- echo "%JL_BUILD_SCRIPT%"
- C:\julia\bin\julia -e "using Pkg; pkg\"add https://github.com/staticfloat/Cairo.jl#sf/jll_packages\""
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"

test_script:
Expand Down
34 changes: 0 additions & 34 deletions deps/build.jl

This file was deleted.

6 changes: 2 additions & 4 deletions src/Rsvg.jl
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
module Rsvg

depsjl = joinpath(@__DIR__, "..", "deps", "deps.jl")
isfile(depsjl) ? include(depsjl) : error("Rsvg not properly ",
"installed. Please run\nPkg.build(\"Rsvg\")")

using Cairo
using Glib_jll
using Librsvg_jll

include("gerror.jl")
include("gio.jl")
Expand Down

0 comments on commit e783879

Please sign in to comment.