Skip to content

Commit e9b4b88

Browse files
committed
Step toward GUI migration to circle. Have circle deploy to npm (via the circlelatest tag) and github pages.
Turning off github pages deploy in travis.
1 parent 6fdf299 commit e9b4b88

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

.circleci/config.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -186,22 +186,21 @@ workflows:
186186
- store_dist:
187187
requires:
188188
- build
189-
# Disable deployment while running in parallel with Travis
190-
# - deploy-npm:
191-
# requires:
192-
# - lint
193-
# - unit
194-
# - integration
195-
# - build
196-
# filters:
197-
# branches:
198-
# only:
199-
# - master
200-
# - develop
201-
# - /^hotfix\/.*/
202-
# - deploy-gh-pages:
203-
# requires:
204-
# - lint
205-
# - unit
206-
# - integration
207-
# - build
189+
- deploy-npm:
190+
requires:
191+
- lint
192+
- unit
193+
- integration
194+
- build
195+
filters:
196+
branches:
197+
only:
198+
- master
199+
- develop
200+
- /^hotfix\/.*/
201+
- deploy-gh-pages:
202+
requires:
203+
- lint
204+
- unit
205+
- integration
206+
- build

.travis.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,14 @@ deploy:
5151
condition: $TRAVIS_EVENT_TYPE != cron
5252
skip_cleanup: true
5353
script: if npm info scratch-gui | grep -q $RELEASE_VERSION; then git tag $RELEASE_VERSION && git push https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git $RELEASE_VERSION; fi
54-
- provider: script
55-
on:
56-
all_branches: true
57-
condition: $TRAVIS_EVENT_TYPE != cron && ! $TRAVIS_BRANCH =~ ^dependabot/
58-
tags: false # Don't push tags to gh-pages
59-
skip_cleanup: true
60-
script: npm run deploy -- -x -e $TRAVIS_BRANCH -r https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
54+
# Disable deploy to gh-pages. Circle will do it instead.
55+
# - provider: script
56+
# on:
57+
# all_branches: true
58+
# condition: $TRAVIS_EVENT_TYPE != cron && ! $TRAVIS_BRANCH =~ ^dependabot/
59+
# tags: false # Don't push tags to gh-pages
60+
# skip_cleanup: true
61+
# script: npm run deploy -- -x -e $TRAVIS_BRANCH -r https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
6162
- provider: script
6263
on:
6364
branch: develop

0 commit comments

Comments
 (0)