Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Hronom committed Nov 7, 2015
2 parents 13fb23d + 1e37c71 commit 6840b29
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
18 changes: 13 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,21 @@ before_install:
- sudo apt-get update -y
- sudo apt-get install -y python-software-properties build-essential
- sudo apt-get install -y libgd2-xpm ia32-libs ia32-libs-multiarch

after_success:
- bash <(curl -s https://codecov.io/bash)


env:
global:
- APP_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.4.0:exec)

notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/19792f1aab7f7585c739
on_success: change # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: false # default: false

after_success:
- bash <(curl -s https://codecov.io/bash)

deploy:
provider: releases
Expand All @@ -20,4 +28,4 @@ deploy:
- "poker-helper-gui/dist/poker-helper-gui-$APP_VERSION-bin.zip"
skip_cleanup: true
on:
tags: true
tags: true
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
[![Build Status](https://travis-ci.org/Hronom/poker-helper.svg?branch=master)](https://travis-ci.org/Hronom/poker-helper)
[![codecov.io](http://codecov.io/github/Hronom/poker-helper/coverage.svg?branch=master)](http://codecov.io/github/Hronom/poker-helper?branch=master)
[![Dependency Status](https://www.versioneye.com/user/projects/55b3aa0c643533001a000552/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55b3aa0c643533001a000552)
[![Join the chat at https://gitter.im/Hronom/poker-helper](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Hronom/poker-helper?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

# Описание #
Простейшая реализация подсчётов из видео http://ru.pokerstrategy.com/video/29712/
Expand All @@ -11,4 +12,4 @@

Сила покерных рук – оцените вашу комбинацию http://ru.pokerstrategy.com/poker-hand-evaluations/

Starting Hand Chart (BSS) - http://resources.pokerstrategy.com/oldresources/ru/ps_bbs_chart_ru.pdf
Starting Hand Chart (BSS) - http://resources.pokerstrategy.com/oldresources/ru/ps_bbs_chart_ru.pdf

0 comments on commit 6840b29

Please sign in to comment.