Skip to content

Commit

Permalink
only perform master sync on PRs
Browse files Browse the repository at this point in the history
  • Loading branch information
jbhoosreddy committed Nov 12, 2019
1 parent 4f24ab7 commit 60f84cf
Showing 1 changed file with 6 additions and 20 deletions.
26 changes: 6 additions & 20 deletions .circleci/config.yml
Expand Up @@ -73,10 +73,13 @@ jobs:
steps:
- checkout
- run:
name: Sync with latest master branch
name: Sync with latest master branch (only on PRs)
command: |
git fetch origin refs/$CIRCLE_BRANCH/merge
git checkout -qf FETCH_HEAD
if [ -n "$CIRCLE_PULL_REQUEST" ]
then
git fetch origin refs/$CIRCLE_BRANCH/merge
git checkout -qf FETCH_HEAD
fi
- restore-cache: *restore-yarn-cache
- restore-cache: *restore-node-modules-cache
- run:
Expand Down Expand Up @@ -139,20 +142,3 @@ workflows:
jobs:
- test
- test262
# master:
# jobs:
# - test262:
# filters:
# branches:
# only:
# - master
# test262:
# jobs:
# - test262
# test262-after-approval:
# jobs:
# - approve-test262-run:
# type: approval
# - test262
# requires:
# - approve-test262-run

0 comments on commit 60f84cf

Please sign in to comment.