Skip to content

Commit 0666bda

Browse files
committed
PTNFLY_2035 Consolidate angular-patternfly dependency management on npm.
1 parent 2bcc83e commit 0666bda

File tree

7 files changed

+4426
-120
lines changed

7 files changed

+4426
-120
lines changed

.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ env:
1010
- TRIGGER_REPO_BRANCH: "master"
1111

1212
before_install:
13-
- 'git checkout -B $TRAVIS_BRANCH' # Reconcile detached HEAD
14-
- 'npm install -g bower grunt-cli'
13+
- if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
14+
- npm install -g bower grunt-cli
15+
- npm install patternfly-eng-release
16+
17+
install: true
1518

1619
script:
17-
- sh -x ./scripts/build.sh
20+
- sh -x ./node_modules/patternfly-eng-release/scripts/_build.sh -a
1821

1922
after_success:
2023
- ./scripts/publish-ghpages.sh -t docs
@@ -30,4 +33,4 @@ deploy:
3033
skip_cleanup: true
3134
on: # The branch and repo that triggered the build
3235
branch: master
33-
condition: $TRAVIS_REPO_SLUG = "patternfly/angular-patternfly"
36+
condition: $TRAVIS_REPO_SLUG = "patternfly/angular-patternfly"

Gruntfile.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ module.exports = function (grunt) {
5454
},
5555
copy: {
5656
docdata: {
57-
cwd: 'lib/patternfly/dist',
57+
cwd: 'node_modules/patternfly/dist',
5858
src: ['fonts/*', 'img/*'],
5959
dest: 'docs',
6060
expand: true
6161
},
6262
fa: {
63-
cwd: 'lib/patternfly/',
63+
cwd: 'node_modules/patternfly/',
6464
src: ['components/font-awesome/**'],
6565
dest: 'docs',
6666
expand: true
@@ -125,21 +125,21 @@ module.exports = function (grunt) {
125125
dest: 'docs',
126126
image: 'misc/logo-alt.svg',
127127
scripts: [
128-
'lib/moment/moment.js',
129-
'lib/c3/c3.js',
130-
'lib/d3/d3.js',
131-
'lib/patternfly/dist/js/patternfly-settings.js',
132-
'lib/angular/angular.js',
133-
'lib/angular-sanitize/angular-sanitize.js',
134-
'lib/angular-animate/angular-animate.js',
135-
'lib/angular-bootstrap/ui-bootstrap-tpls.js',
128+
'node_modules/moment/moment.js',
129+
'node_modules/c3/c3.js',
130+
'node_modules/d3/d3.js',
131+
'node_modules/patternfly/dist/js/patternfly-settings.js',
132+
'node_modules/angular/angular.js',
133+
'node_modules/angular-sanitize/angular-sanitize.js',
134+
'node_modules/angular-animate/angular-animate.js',
135+
'node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js',
136136
'misc/angular-bootstrap-prettify.js',
137-
'lib/lodash/dist/lodash.min.js',
137+
'node_modules/lodash/lodash.min.js',
138138
'dist/angular-patternfly.js',
139-
'lib/angular-ui-router/release/angular-ui-router.min.js'],
139+
'node_modules/angular-ui-router/release/angular-ui-router.min.js'],
140140
html5Mode: false,
141141
template: 'grunt-ngdocs-index.tmpl',
142-
styles: ['lib/patternfly/dist/css/patternfly.css', 'lib/patternfly/dist/css/patternfly-additions.css',
142+
styles: ['node_modules/patternfly/dist/css/patternfly.css', 'node_modules/patternfly/dist/css/patternfly-additions.css',
143143
'dist/styles/angular-patternfly.css', 'misc/ng-docs.css', 'misc/examples.css']
144144
},
145145

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-patternfly",
3-
"version": "3.15.0",
3+
"version": "3.16.0",
44
"authors": [
55
"Red Hat"
66
],

0 commit comments

Comments
 (0)