Skip to content

Commit

Permalink
Bump version: 1.1.0 → 1.2.0-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
bivab committed Jan 16, 2017
1 parent f308ec4 commit 568776e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.1.0
current_version = 1.2.0-dev
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>\w+))?
tag = False
commit = True
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ before_script:
script:
- make travis
after_success:
- cp handbook-1.1.0.pdf latest.pdf
- cp handbook-1.1.0.html latest.html
- travis-custom-deploy sftp handbook-1.1.0.pdf handbook-1.1.0.html latest.pdf latest.html
- cp handbook-1.2.0-dev.pdf latest.pdf
- cp handbook-1.2.0-dev.html latest.html
- travis-custom-deploy sftp handbook-1.2.0-dev.pdf handbook-1.2.0-dev.html latest.pdf latest.html
notification:
email:
on_success: never
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
MARKDOWN=$(filter-out README.md,$(wildcard *.md))

default: handbook.pdf handbook.html
travis: handbook-1.1.0.html handbook-1.1.0.pdf
travis: handbook-1.2.0-dev.html handbook-1.2.0-dev.pdf

.PHONY: dependencies
dependencies:
git submodule update --init

handbook-1.1.0.html: $(MARKDOWN) dependencies
handbook-1.2.0-dev.html: $(MARKDOWN) dependencies
pandoc -f markdown -t html --css=markdown-css-themes/markdown10.css \
--standalone --self-contained $(MARKDOWN) -o $@

handbook.html: handbook-1.1.0.html
handbook.html: handbook-1.2.0-dev.html
cp $< $@

handbook-1.1.0.pdf: $(MARKDOWN)
handbook-1.2.0-dev.pdf: $(MARKDOWN)
pandoc --standalone -f markdown -t latex $(MARKDOWN) -o $@

handbook.pdf: handbook-1.1.0.pdf
handbook.pdf: handbook-1.2.0-dev.pdf
cp $< $@

clean:
Expand Down

0 comments on commit 568776e

Please sign in to comment.