Skip to content

Commit

Permalink
Build release tags on Travis
Browse files Browse the repository at this point in the history
this should hopefully result in automatic docs deployment to release-0.6

run travis on release tags but not pre-release tags

(cherry picked from commit 177156c)
ref #21846

Fix doctest line numbers

(cherry picked from commit e327b39)

Upgrade Documenter to v0.10.2

(cherry picked from commit e1f36c3)
  • Loading branch information
tkelman committed May 14, 2017
1 parent a43bee5 commit 72cf3fe
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ branches:
only:
- master
- /^release-.*/
- /^v\d+\.\d+\.\d+$/
notifications:
email: false
irc:
Expand Down
4 changes: 2 additions & 2 deletions base/channels.jl
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ julia> take!(c)
julia> put!(c,1);
ERROR: foo
Stacktrace:
[1] check_channel_state(::Channel{Any}) at ./channels.jl:126
[2] put!(::Channel{Any}, ::Int64) at ./channels.jl:256
[1] check_channel_state(::Channel{Any}) at ./channels.jl:131
[2] put!(::Channel{Any}, ::Int64) at ./channels.jl:261
```
"""
function bind(c::Channel, task::Task)
Expand Down
4 changes: 2 additions & 2 deletions doc/REQUIRE
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Compat 0.24.0 0.24.0+
Compat 0.25.0 0.25.0+
DocStringExtensions 0.3.3 0.3.3+
Documenter 0.10.0 0.10.0+
Documenter 0.10.2 0.10.2+

0 comments on commit 72cf3fe

Please sign in to comment.