Skip to content

Commit 82b1864

Browse files
authored
Merge pull request #53 from JuliaRobotics/rd/test-1.0
tests should pass on 1.0
2 parents 43b3103 + e29f22b commit 82b1864

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ branches:
1616
- /^release-.*$/
1717
matrix:
1818
allow_failures:
19-
- julia: 1.0
2019
- julia: nightly
2120
after_success:
2221
- julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

REQUIRE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
julia 0.7-rc1
2-
BinDeps 0.4.0
1+
julia 0.7
2+
BinDeps 0.8
33
@osx Homebrew 0.3.0
4-
CMakeWrapper 0.0.1
4+
CMakeWrapper 0.2
55
StaticArrays 0.5
66
FastIOBuffers 0.0.1

deps/build.jl

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,19 @@ function cflags_validator(pkg_names...)
1818
end
1919

2020
# Explicitly disallow global LCM installations
21-
validate_lcm(name, handle) = contains(name, dirname(@__FILE__))
21+
validate_lcm(name, handle) = occursin(dirname(@__FILE__), name)
2222

2323
@static if Sys.islinux()
24-
deps = [
25-
python = library_dependency("python", aliases=["libpython2.7.so", "libpython3.2.so", "libpython3.3.so", "libpython3.4.so", "libpython3.5.so", "libpython3.6.so", "libpython3.7.so", "libpython3.8.so"], validate=cflags_validator("python", "python2", "python3"))
26-
glib = library_dependency("glib", aliases=["libglib-2.0-0", "libglib-2.0", "libglib-2.0.so.0"], depends=[python], validate=cflags_validator("glib-2.0"))
27-
lcm = library_dependency("lcm", aliases=["liblcm", "liblcm.1"], depends=[glib],
28-
validate=validate_lcm)
24+
python = library_dependency("python", aliases=["libpython2.7.so", "libpython3.2.so", "libpython3.3.so", "libpython3.4.so", "libpython3.5.so", "libpython3.6.so", "libpython3.7.so", "libpython3.8.so"], validate=cflags_validator("python", "python2", "python3"))
25+
glib = library_dependency("glib", aliases=["libglib-2.0-0", "libglib-2.0", "libglib-2.0.so.0"], depends=[python], validate=cflags_validator("glib-2.0"))
26+
lcm = library_dependency("lcm", aliases=["liblcm", "liblcm.1"], depends=[glib],
27+
validate=validate_lcm)
2928

30-
provides(AptGet, Dict("python-dev" => python, "libglib2.0-dev" => glib))
31-
]
29+
provides(AptGet, Dict("python-dev" => python, "libglib2.0-dev" => glib))
3230
else
33-
deps = [
34-
glib = library_dependency("glib", aliases = ["libglib-2.0-0", "libglib-2.0", "libglib-2.0.so.0"])
35-
lcm = library_dependency("lcm", aliases=["liblcm", "liblcm.1"], depends=[glib],
36-
validate=validate_lcm)
37-
]
31+
glib = library_dependency("glib", aliases = ["libglib-2.0-0", "libglib-2.0", "libglib-2.0.so.0"])
32+
lcm = library_dependency("lcm", aliases=["liblcm", "liblcm.1"], depends=[glib],
33+
validate=validate_lcm)
3834
end
3935

4036
prefix = joinpath(BinDeps.depsdir(lcm), "usr")

0 commit comments

Comments
 (0)