Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new Artifacts framework to install binary dependencies #36

Merged
merged 6 commits into from
Dec 7, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,32 @@ language: julia
os:
- linux
- osx
- windows
arch:
- x64
- x86
- arm64
giordano marked this conversation as resolved.
Show resolved Hide resolved
julia:
- 0.7
- 1.0
- 1.1
- 1.3
- nightly
matrix:
allow_failures:
- julia: nightly
exclude:
- os: osx
arch: x86
- os: osx
arch: arm64
- os: windows
arch: arm64
- julia: nightly
arch: arm64
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)'
giordano marked this conversation as resolved.
Show resolved Hide resolved

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"
giordano marked this conversation as resolved.
Show resolved Hide resolved

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

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

matrix:
Expand All @@ -28,6 +27,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\""
giordano marked this conversation as resolved.
Show resolved Hide resolved
- 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