diff --git a/.circleci/config.yml b/.circleci/config.yml index 666581c7ee80..ff0ddbb580a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,7 +75,10 @@ jobs: - run: name: Sync with latest master branch command: | - git pull origin master + git config --global user.email "you@example.com" + git config --global user.name "Your Name" + git fetch origin master + git rebase origin/master - restore-cache: *restore-yarn-cache - restore-cache: *restore-node-modules-cache - run: @@ -94,10 +97,8 @@ jobs: name: Setup Test Runner command: | # Switch to master branch later - git clone --recurse-submodules https://github.com/jbhoosreddy/babel-test262-runner + git clone --recurse-submodules https://github.com/babel/babel-test262-runner cd babel-test262-runner - git fetch origin detect-circleci-master - git checkout detect-circleci-master yarn yarn add tap-mocha-reporter --dev curl -L https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 > jq @@ -135,22 +136,22 @@ jobs: <<: *test262_workdir - store_test_results: *artifact_test262_xunit - workflows: version: 2 test: jobs: - test - master: - jobs: - - test262: - filters: - branches: - only: - - master - test262: - jobs: - test262 +# master: +# jobs: +# - test262: +# filters: +# branches: +# only: +# - master +# test262: +# jobs: +# - test262 # test262-after-approval: # jobs: # - approve-test262-run: