Skip to content

Commit ec22d76

Browse files
committed
add push to dist to travis task
1 parent 945f7d5 commit ec22d76

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ language: php
44
branches:
55
only:
66
- master
7+
- trunk
78
- develop
89
- /^release\/*/
910
- /^hotfix\/\d+\.\d+(\.\d+)?(-\S*)?$/
1011
- /^feature\/*/
1112
# Also build tags like 1.1.1 or 1.1 for deployment.
1213
- /^\d+\.\d+(\.\d+)?(-\S*)?$/
13-
# for testing deploy
14-
- push-to-dist
1514

1615
cache:
1716
directories:
@@ -53,7 +52,7 @@ jobs:
5352
grunt update-version
5453
fi
5554
- grunt artifact
56-
if: ( tag IS present OR branch =~ /^feature\// OR branch =~ /^release\// OR branch =~ /^hotfix\// OR branch = trunk OR branch = push-to-dist ) AND type != pull_request
55+
if: ( tag IS present OR branch =~ /^feature\// OR branch =~ /^release\// OR branch =~ /^hotfix\// OR branch = trunk OR branch = develop ) AND type != pull_request
5756
before_install:
5857
- nvm install lts/*
5958
- curl -o- -L https://yarnpkg.com/install.sh | bash

config/travis/deploy_to_dist.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ lastTag=$1
2929
branch="master"
3030
mainDir=$(pwd)
3131

32-
if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" || $lastTag == "push-to-dist" ]]; then
32+
if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" || $lastTag == "trunk" ]]; then
3333
branch=$lastTag
3434
fi
3535

@@ -54,7 +54,7 @@ cd ./artifact
5454
git add -A
5555

5656
# If it's a feature, release or trunk branch.
57-
if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" || $lastTag == "push-to-dist" ]]; then
57+
if [[ $lastTag =~ ^feature/* || $lastTag =~ ^release/* || $lastTag =~ ^hotfix/* || $lastTag == "develop" || $lastTag == "trunk" ]]; then
5858
git commit --allow-empty -m "${TRAVIS_COMMIT_MESSAGE}"
5959
else
6060
git commit -m "Release ${lastTag}"

0 commit comments

Comments
 (0)