Skip to content

Commit 9ebe6b8

Browse files
update build
1 parent e03e83b commit 9ebe6b8

File tree

4 files changed

+32
-34
lines changed

4 files changed

+32
-34
lines changed

.travis.yml

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
1-
## Documentation: http://docs.travis-ci.com/user/languages/julia/
21
language: julia
2+
sudo: required
33
os:
44
- linux
55
- osx
66
julia:
7-
- 0.6
7+
- 0.7
8+
- 1.0
89
- nightly
10+
matrix:
11+
allow_failures:
12+
- julia: nightly
913
notifications:
1014
email: false
11-
git:
12-
depth: 99999999
13-
14-
## uncomment the following lines to allow failures on nightly julia
15-
## (tests will run but not make your overall status red)
16-
#matrix:
17-
# allow_failures:
18-
# - julia: nightly
19-
20-
## uncomment and modify the following lines to manually install system packages
21-
#addons:
22-
# apt: # apt-get for linux
23-
# packages:
24-
# - gfortran
25-
#before_script: # homebrew for mac
26-
# - if [ $TRAVIS_OS_NAME = osx ]; then brew install gcc; fi
27-
28-
## uncomment the following lines to override the default test script
29-
#script:
30-
# - julia -e 'Pkg.clone(pwd()); Pkg.build("GtkMarkdownTextView"); Pkg.test("GtkMarkdownTextView"; coverage=true)'
15+
addons:
16+
apt:
17+
packages:
18+
- xvfb
19+
- xauth
20+
- libgtk-3-dev
21+
script:
22+
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
23+
- if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
24+
- $TESTCMD -e 'using Pkg;
25+
Pkg.add(PackageSpec(url="https://github.com/jonathanBieler/GtkExtensions.jl.git", rev="master"));
26+
Pkg.clone(pwd());
27+
Pkg.build("GtkMarkdownTextView");
28+
Pkg.test("GtkMarkdownTextView"; coverage=true)'
3129
after_success:
32-
# push coverage results to Coveralls
33-
- julia -e 'cd(Pkg.dir("GtkMarkdownTextView")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
34-
# push coverage results to Codecov
35-
- julia -e 'cd(Pkg.dir("GtkMarkdownTextView")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
30+
- julia -e 'cd(Pkg.dir("GtkMarkdownTextView"));
31+
Pkg.add("Coverage");
32+
using Coverage;
33+
Coveralls.submit(Coveralls.process_folder())'

deps/build.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
using Pkg
2+
Pkg.add(PackageSpec(url="https://github.com/jonathanBieler/GtkExtensions.jl.git", rev="master"))

src/GtkMarkdownTextView.jl

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module GtkMarkdownTextView
22

3-
using Gtk
4-
using GtkExtensions
3+
using Gtk, GtkExtensions
54
import Gtk.GtkTextIter
65

76
using Markdown
@@ -55,12 +54,12 @@ module GtkMarkdownTextView
5554
Gtk.gobject_move_ref(n, view)
5655
end
5756

58-
MarkdownTextView(m::String) = MarkdownTextView(Base.Markdown.parse(m),"")
59-
MarkdownTextView(m::String,prelude::String, mc::MarkdownColors) = MarkdownTextView(Base.Markdown.parse(m),prelude,mc)
60-
MarkdownTextView(m::String, mc::MarkdownColors) = MarkdownTextView(Base.Markdown.parse(m),"",mc)
57+
MarkdownTextView(m::String) = MarkdownTextView(Markdown.parse(m),"")
58+
MarkdownTextView(m::String,prelude::String, mc::MarkdownColors) = MarkdownTextView(Markdown.parse(m),prelude,mc)
59+
MarkdownTextView(m::String, mc::MarkdownColors) = MarkdownTextView(Markdown.parse(m),"",mc)
6160

6261
end
63-
62+
6463
function tag(buffer,what,i,j)
6564
Gtk.apply_tag(buffer,what,
6665
GtkTextIter(buffer,i) , GtkTextIter(buffer,j)
@@ -88,7 +87,6 @@ module GtkMarkdownTextView
8887
i = insert_MD!(buffer,m.formula,i)
8988
end
9089

91-
9290
function insert_MD!(buffer,m::Markdown.Paragraph,i)
9391
# insert!(buffer,"\n\n")
9492
# i += 2

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ using Gtk
99
v = MarkdownTextView(md)
1010
push!(w,v)
1111
showall(w)
12-
sleep(10)
12+
sleep(1)
1313
destroy(w)
1414

1515
end

0 commit comments

Comments
 (0)