Skip to content
This repository has been archived by the owner on Sep 18, 2018. It is now read-only.

WIP Deploy #12

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ install:
- yarn install
- sudo apt-get install jq
before_script:
- git checkout $TRAVIS_BRANCH
- if [ $TRAVIS_PULL_REQUEST = false ]; then git checkout $TRAVIS_BRANCH fi
script:
- yarn test
after_success:
Expand Down
4 changes: 2 additions & 2 deletions ci/scripts/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

# Deploy in develop
if [[ $TRAVIS_BRANCH == 'develop' ]]; then
if [[ $TRAVIS_BRANCH == 'develop' && $TRAVIS_PULL_REQUEST = false ]]; then
if [[ $TRAVIS_COMMIT_MESSAGE != *"ci(release): generate CHANGELOG.md for version"* && $TRAVIS_COMMIT_MESSAGE != "build(react-winjs): transpile and minify library" ]]; then
# Generate CHANGELOG.md and increment version
yarn run release
Expand All @@ -19,7 +19,7 @@ if [[ $TRAVIS_BRANCH == 'develop' ]]; then
fi

# Deploy in master
if [[ $TRAVIS_BRANCH == 'master' ]]; then
if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST = false ]]; then
if [[ $TRAVIS_COMMIT_MESSAGE != *"ci(release): generate CHANGELOG.md for version"* && $TRAVIS_COMMIT_MESSAGE != "build(react-winjs): transpile and minify library" ]]; then
# Generate CHANGELOG.md and increment version
yarn run release -- -m 'ci(release): generate CHANGELOG.md for version %s'
Expand Down