Skip to content

Commit

Permalink
Fix deploy branch check
Browse files Browse the repository at this point in the history
  • Loading branch information
@xoseperez
xoseperez committed Apr 8, 2018
1 parent 5a5c38c commit 43af63b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ ESPurna ("spark" in Catalan) is a custom firmware for ESP8285/ESP8266 based smar
It uses the Arduino Core for ESP8266 framework and a number of 3rd party libraries.

[![version](https://img.shields.io/badge/version-1.12.5-brightgreen.svg)](CHANGELOG.md)
![branch](https://img.shields.io/badge/branch-dev-orange.svg)
[![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=dev)](https://travis-ci.org/xoseperez/espurna)
[![codacy](https://img.shields.io/codacy/grade/c9496e25cf07434cba786b462cb15f49/dev.svg)](https://www.codacy.com/app/xoseperez/espurna/dashboard)
![branch](https://img.shields.io/badge/branch-master-orange.svg)
[![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=master)](https://travis-ci.org/xoseperez/espurna)
[![codacy](https://img.shields.io/codacy/grade/c9496e25cf07434cba786b462cb15f49/master.svg)](https://www.codacy.com/app/xoseperez/espurna/dashboard)
[![license](https://img.shields.io/github/license/xoseperez/espurna.svg)](LICENSE)
<br />
[![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=xose%2eperez%40gmail%2ecom&lc=US&no_note=0&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHostedGuest)
Expand Down
3 changes: 2 additions & 1 deletion code/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ if [ $# -eq 0 ]; then

# Hook to build travis test envs
if [[ "${TRAVIS_BRANCH}" != "" ]]; then
if [[ ${TRAVIS_BRANCH} != "master" ]]; then
re='^[0-9]+\.[0-9]+\.[0-9]+$'
if ! [[ ${TRAVIS_BRANCH} =~ $re ]]; then
environments=$travis
fi
fi
Expand Down

1 comment on commit 43af63b

@mcspr
Copy link
Collaborator

@mcspr mcspr commented on 43af63b Apr 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's also TRAVIS_TAG (should be 1.12.5 on this release)
Maybe TRAVIS_COMMIT_MESSAGE == TRAVIS_TAG ?
And check for TRAVIS_PUSH_REQUEST_BRANCH is empty.

And this probably still will not build as travis will just timeout build process at 49 minutes. There are 72 targets that build around 45 seconds each... I was trying out this beta feature https://docs.travis-ci.com/user/build-stages/ - i.e. each current pio env is separate job and release using github api directly.

Please sign in to comment.