Skip to content

Commit 4214997

Browse files
Merge pull request #564 from dlabrecq/semantic-pre2
Semantic release: refactored patternfly-eng-release to update bower.json
2 parents 68e0b80 + fb3aa16 commit 4214997

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,17 @@ before_install:
2424
install: true
2525

2626
script:
27-
- 'if [[ -n "$NPM_TOKEN" && -n "$GH_TOKEN" && "$TRAVIS_BRANCH" = "master-dist" ]]; then
28-
npm run semantic-release-pre;
29-
fi'
3027
- sh -x ./node_modules/patternfly-eng-release/scripts/_build.sh -a
3128

3229
after_success:
33-
- 'if [[ -n "$NPM_TOKEN" && -n "$GH_TOKEN" && "$TRAVIS_BRANCH" = "master-dist" ]]; then
30+
- 'if [[ "$TRAVIS_SECURE_ENV_VARS" = "true" && "$TRAVIS_BRANCH" = "master-dist" ]]; then
3431
npm prune;
32+
npm run semantic-release-pre;
33+
sh -x ./node_modules/patternfly-eng-release/scripts/semantic-release/_bump.sh -a || travis_terminate 0;
3534
npm run semantic-release-publish;
3635
npm run semantic-release-post;
36+
- sh -x ./node_modules/patternfly-eng-release/scripts/semantic-release/_publish-webjar.sh -a;
3737
fi'
38-
- sh -x ./node_modules/patternfly-eng-release/scripts/semantic-release/_publish-webjar.sh -a
3938
- ./scripts/publish-ghpages.sh -t docs
4039

4140
branches:

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"karma-phantomjs-launcher": "^1.0.0",
5454
"matchdep": "0.3.0",
5555
"nsp": "^2.6.1",
56-
"patternfly-eng-release": "^3.26.15",
56+
"patternfly-eng-release": "^3.26.25",
5757
"semantic-release": "^6.3.6"
5858
},
5959
"optionalDependencies": {

0 commit comments

Comments
 (0)