Skip to content

Commit 30248ce

Browse files
authored
Merge branch 'master' into 8299/table-row-height
2 parents 801eb50 + 0c4ee2e commit 30248ce

File tree

694 files changed

+23525
-13968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

694 files changed

+23525
-13968
lines changed

.circleci/config.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Configuration file for https://circleci.com/gh/angular/material2
2+
3+
# Note: YAML anchors allow an object to be re-used, reducing duplication.
4+
# The ampersand declares an alias for an object, then later the `<<: *name`
5+
# syntax dereferences it.
6+
# See http://blog.daemonl.com/2016/02/yaml.html
7+
# To validate changes, use an online parser, eg.
8+
# http://yaml-online-parser.appspot.com/
9+
10+
# Settings common to each job
11+
anchor_1: &job_defaults
12+
working_directory: ~/ng
13+
docker:
14+
- image: angular/ngcontainer:0.1.0
15+
16+
# After checkout, rebase on top of master.
17+
# Similar to travis behavior, but not quite the same.
18+
# By default, PRs are not rebased on top of master, which we want.
19+
# See https://discuss.circleci.com/t/1662
20+
anchor_2: &post_checkout
21+
post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
22+
23+
version: 2
24+
jobs:
25+
build:
26+
<<: *job_defaults
27+
resource_class: large
28+
steps:
29+
- checkout:
30+
<<: *post_checkout
31+
- restore_cache:
32+
key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
33+
34+
- run: bazel run @nodejs//:npm install
35+
# For some reason, circleci needs the postinstall to be run explicitly.
36+
# This may be unnecessary once rules_nodejs uses nodejs 8
37+
- run: bazel run @nodejs//:npm run postinstall
38+
- run: bazel build src/...
39+
- save_cache:
40+
key: material2-{{ .Branch }}-{{ checksum "package-lock.json" }}
41+
paths:
42+
- "node_modules"
43+
44+
workflows:
45+
version: 2
46+
default_workflow:
47+
jobs:
48+
- build
49+
50+
notify:
51+
webhooks:
52+
- url: https://us-central1-test-jperrott.cloudfunctions.net/circleCi
53+
54+
general:
55+
branches:
56+
only:
57+
- master

.github/CODEOWNERS

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
/src/lib/chips/** @tinayuangao
99
/src/lib/datepicker/** @mmalerba
1010
/src/lib/dialog/** @jelbourn @crisbeto
11+
/src/lib/divider/** @jelbourn @crisbeto
1112
/src/lib/expansion/** @josephperrott @jelbourn
1213
/src/lib/form-field/** @mmalerba
1314
/src/lib/grid-list/** @kara @jelbourn
1415
/src/lib/icon/** @jelbourn
1516
/src/lib/input/** @mmalerba
16-
/src/lib/list/** @jelbourn @crisbeto
17+
/src/lib/list/** @jelbourn @crisbeto @devversion
1718
/src/lib/menu/** @kara @crisbeto
1819
/src/lib/paginator/** @andrewseguin
1920
/src/lib/progress-bar/** @jelbourn @crisbeto @josephperrott
@@ -34,13 +35,14 @@
3435
# Angular Material core
3536
/src/lib/core/* @jelbourn
3637
/src/lib/core/animation/** @jelbourn
37-
/src/lib/core/common-behaviors/** @jelbourn
38+
/src/lib/core/common-behaviors/** @jelbourn @devversion
3839
/src/lib/core/datetime/** @mmalerba
3940
/src/lib/core/error/** @crisbeto @mmalerba
4041
/src/lib/core/gestures/** @jelbourn
4142
/src/lib/core/line/** @jelbourn
4243
/src/lib/core/option/** @kara @crisbeto
4344
/src/lib/core/placeholder/** @kara @mmalerba
45+
/src/lib/core/label/** @kara @mmalerba
4446
/src/lib/core/ripple/** @devversion
4547
/src/lib/core/selection/** @tinayuangao @jelbourn
4648
/src/lib/core/selection/pseudo*/** @crisbeto @jelbourn
@@ -71,6 +73,13 @@
7173
# Moment adapter package
7274
/src/material-moment-adapter/** @mmalerba
7375

76+
# Material experimental package
77+
/src/material-experimental/** @jelbourn
78+
/src/material-experimental/dialog/** @jelbourn @josephperrott @crisbeto
79+
80+
# CDK experimental package
81+
/src/cdk-experimental/** @jelbourn
82+
7483
# Docs examples & guides
7584
/guides/** @amcdnl @jelbourn
7685
/src/material-examples/** @amcdnl @jelbourn
@@ -96,7 +105,7 @@
96105
/src/demo-app/grid-list/** @kara @jelbourn
97106
/src/demo-app/icon/** @jelbourn
98107
/src/demo-app/input/** @mmalerba
99-
/src/demo-app/list/** @jelbourn @crisbeto
108+
/src/demo-app/list/** @jelbourn @crisbeto @devversion
100109
/src/demo-app/live-announcer/** @jelbourn
101110
/src/demo-app/menu/** @kara @crisbeto
102111
/src/demo-app/overlay/** @jelbourn @crisbeto
@@ -132,7 +141,7 @@
132141
/e2e/components/grid-list-e2e.spec.ts @kara @jelbourn
133142
/e2e/components/icon-e2e.spec.ts @jelbourn
134143
/e2e/components/input-e2e.spec.ts @mmalerba
135-
/e2e/components/list-e2e.spec.ts @jelbourn @crisbeto
144+
/e2e/components/list-e2e.spec.ts @jelbourn @crisbeto @devversion
136145
/e2e/components/menu-e2e.spec.ts @kara @crisbeto
137146
/e2e/components/progress-bar-e2e.spec.ts @jelbourn @crisbeto @josephperrott
138147
/e2e/components/progress-spinner-e2e.spec.ts @jelbourn @crisbeto @josephperrott
@@ -165,6 +174,7 @@
165174
/src/universal-app/** @jelbourn
166175

167176
# Tooling
177+
/.circleci/** @jelbourn
168178
/scripts/** @devversion @jelbourn
169179
/test/** @devversion @jelbourn
170180
/tools/** @devversion @jelbourn

.travis.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sudo: false
33
dist: trusty
44

55
node_js:
6-
- '7'
6+
- '8'
77

88
addons:
99
jwt:
@@ -30,7 +30,7 @@ jobs:
3030
- env: "MODE=saucelabs_required"
3131
- env: "MODE=browserstack_required"
3232
- env: "MODE=travis_required"
33-
env: "DEPLOY_MODE=build-artifacts"
33+
- env: "DEPLOY_MODE=build-artifacts"
3434
- env: "DEPLOY_MODE=docs-content"
3535
- env: "DEPLOY_MODE=screenshot-tool"
3636
- env: "DEPLOY_MODE=dashboard"
@@ -58,3 +58,13 @@ script:
5858
cache:
5959
directories:
6060
- ./node_modules/
61+
62+
notifications:
63+
webhooks:
64+
urls:
65+
- https://us-central1-test-jperrott.cloudfunctions.net/travisCi
66+
on_success: always
67+
on_failure: always
68+
on_start: always
69+
on_cancel: always
70+
on_error: always

BUILD.bazel

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package(default_visibility = ["//visibility:public"])
2+
3+
# TODO(jelbourn): figure out if these workarounds are still needed
4+
5+
# This rule belongs in node_modules/BUILD
6+
# It's here as a workaround for
7+
# https://github.com/bazelbuild/bazel/issues/374#issuecomment-296217940
8+
filegroup(
9+
name = "node_modules",
10+
# Performance workaround: list individual files
11+
# Reduces the number of files as inputs to nodejs_binary:
12+
# bazel query "deps(:node_modules)" | wc -l
13+
# This won't scale in the general case.
14+
# TODO(alexeagle): figure out what to do
15+
srcs = glob(["/".join(["node_modules", pkg, "**", ext]) for pkg in [
16+
"@angular",
17+
"jasmine",
18+
"typescript",
19+
"tslib",
20+
"zone.js",
21+
"@types",
22+
"tsickle",
23+
"hammerjs",
24+
"protobufjs",
25+
"bytebuffer",
26+
"reflect-metadata",
27+
"minimist",
28+
"moment",
29+
] for ext in [
30+
"*.js",
31+
"*.json",
32+
"*.d.ts",
33+
]]),
34+
)
35+

0 commit comments

Comments
 (0)