Skip to content

Commit

Permalink
Merge branch 'master' into p3-preview
Browse files Browse the repository at this point in the history
  • Loading branch information
manolo committed Jun 20, 2018
2 parents 30e2cc9 + 9d195b5 commit e3ee6f7
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 18 deletions.
25 changes: 10 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,34 @@
sudo: false
sudo: true
dist: trusty
language: node_js
node_js: 8.9
node_js: 8.11

cache:
directories:
- node_modules

before_script:
- npm install -g bower polymer-cli@next
- bower install
addons:
firefox: latest
chrome: stable

env:
- POLYMER=2
- POLYMER=3

script:
- if [[ "$POLYMER" = "2" ]]; then
npm install &&
npm -q i && npm i -q --no-save bower polymer-cli && bower -q i &&
polymer lint --rules polymer-2 --input ./src/*.html ./theme/**/*.html &&
if [[ "$TRAVIS_EVENT_TYPE" != "pull_request" && "$TRAVIS_BRANCH" != quick/* ]]; then
npm i --no-save gemini@^4.0.0 gemini-sauce gemini-polyserve &&
npm i -q --no-save gemini@^4.0.0 gemini-sauce gemini-polyserve &&
gemini test test/visual && gemini test test/visual -c .gemini-chrome.yml;
fi;
fi

- if [[ "$POLYMER" = "3" ]]; then
npm install -g yarn magi-cli &&
(cd .. && git clone --depth 1 -b vaadin-components-next git://github.com/web-padawan/polymer-modulizer.git && cd polymer-modulizer && npm link) &&
npm --no-save -q install -g yarn bower magi-cli web-component-tester &&
(cd .. && git clone --depth 1 -b vaadin-components-rc git://github.com/web-padawan/polymer-modulizer.git && cd polymer-modulizer && npm -q link) &&
rm -rf node_modules &&
magi p3-convert --out . --import-style=name &&
yarn install --flat;
fi
# TODO: Visual tests are excluded because gemini-polyserve doesn't support Polymer 3

- if [[ "$TRAVIS_EVENT_TYPE" = "cron" ]]; then
npm install &&
polymer test --env saucelabs-cron;
fi
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
![Polymer 2 supported](https://img.shields.io/badge/Polymer2-supported-blue.svg)
[![Build status](https://travis-ci.org/vaadin/vaadin-icons.svg?branch=master)](https://travis-ci.org/vaadin/vaadin-icons)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/vaadin/web-components?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0.svg)](https://vaadin.com/directory/component/vaadinvaadin-icons)
[![Stars on vaadin.com/directory](https://img.shields.io/vaadin-directory/star/vaadinvaadin-icons.svg)](https://vaadin.com/directory/component/vaadinvaadin-icons)

# Vaadin Icons

Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"devDependencies": {
"iron-component-page": "^3.0.0",
"iron-meta": "^2.0.0",
"vaadin-demo-helpers": "vaadin/vaadin-demo-helpers#p3-preview",
"vaadin-text-field": "vaadin/vaadin-text-field#p3-preview"
"vaadin-demo-helpers": "^2.0.0",
"vaadin-text-field": "vaadin/vaadin-text-field#^2.1.0"
},
"variants": {
"1.x": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vaadin/vaadin-icons",
"version": "4.1.4-pre.2",
"version": "4.1.4",
"description": "Collection of 600+ unique icons designed for web applications",
"main": "vaadin-icons.html",
"repository": "vaadin/vaadin-icons",
Expand Down

0 comments on commit e3ee6f7

Please sign in to comment.