Skip to content

Commit

Permalink
Merge brabch ckeditor5/t/1214
Browse files Browse the repository at this point in the history
Internal: Switched to Yarn. See ckeditor/ckeditor5#1214.
  • Loading branch information
Reinmar committed Jan 10, 2019
2 parents 78296d5 + 1865fda commit cdf3755
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,16 @@ language: node_js
node_js:
- '8'
cache:
- node_modules
yarn: true
branches:
except:
- stable
before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm config set package-lock false
- npm i -g npm@^5.7.1
- npm i -g yarn
install:
- npm install @ckeditor/ckeditor5-dev-tests
- yarn add @ckeditor/ckeditor5-dev-tests
- ckeditor5-dev-tests-install-dependencies
script:
- ckeditor5-dev-tests-travis
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"@ckeditor/ckeditor5-basic-styles": "^10.1.0",
"@ckeditor/ckeditor5-block-quote": "^10.1.1",
"@ckeditor/ckeditor5-ckfinder": "^10.0.0",
"@ckeditor/ckeditor5-dev-utils": "^11.0.0",
"@ckeditor/ckeditor5-dev-webpack-plugin": "^7.0.0",
"@ckeditor/ckeditor5-dev-utils": "^11.0.1",
"@ckeditor/ckeditor5-dev-webpack-plugin": "^7.0.1",
"@ckeditor/ckeditor5-easy-image": "^10.0.4",
"@ckeditor/ckeditor5-editor-classic": "^11.0.2",
"@ckeditor/ckeditor5-essentials": "^10.1.3",
Expand Down

0 comments on commit cdf3755

Please sign in to comment.