Skip to content

Commit ae37be4

Browse files
committed
Merge branch 'master' of github.com:phase2/grunt-drupal-tasks into validate-yaml
2 parents c195760 + 778e22c commit ae37be4

Some content is hidden

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

74 files changed

+3283
-5309
lines changed

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/test/test_assets
2+
/test/test_assets_d8
3+
/test/working_copy

.eslintrc.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
module.exports = {
2+
"extends": "google",
3+
"rules": {
4+
"max-len": 0,
5+
"max-nested-callbacks": ["warn", {"max": 5}],
6+
"valid-jsdoc": 0
7+
}
8+
};

.travis.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
sudo: false
22
language: php
33
php:
4-
- 5.4
54
- 5.5
65
- 5.6
76
- 7
@@ -13,24 +12,20 @@ addons:
1312
- gcc-4.8
1413
- g++-4.8
1514
env:
16-
- NVM_NODE_VERSION="0.12" GDT_DRUPAL_CORE="7" GDT_TEST_URL="http://127.0.0.1:8080/misc/drupal.js" CXX=g++-4.8
17-
- NVM_NODE_VERSION="4.3" GDT_DRUPAL_CORE="8" GDT_TEST_URL="http://127.0.0.1:8080/core/misc/drupal.js" CXX=g++-4.8
18-
- NVM_NODE_VERSION="node" GDT_DRUPAL_CORE="8" GDT_TEST_URL="http://127.0.0.1:8080/core/misc/drupal.js" CXX=g++-4.8
15+
- NVM_NODE_VERSION="4" GDT_DRUPAL_CORE="7" GDT_TEST_URL="http://127.0.0.1:8080/misc/drupal.js" CXX=g++-4.8
16+
- NVM_NODE_VERSION="4" GDT_DRUPAL_CORE="8" GDT_TEST_URL="http://127.0.0.1:8080/core/misc/drupal.js" CXX=g++-4.8
17+
- NVM_NODE_VERSION="5" GDT_DRUPAL_CORE="8" GDT_TEST_URL="http://127.0.0.1:8080/core/misc/drupal.js" CXX=g++-4.8
18+
- NVM_NODE_VERSION="6" GDT_DRUPAL_CORE="8" GDT_TEST_URL="http://127.0.0.1:8080/core/misc/drupal.js" CXX=g++-4.8
1919
matrix:
20-
allow_failures:
21-
- php: 5.5
22-
env: NVM_NODE_VERSION="node" GDT_DRUPAL_CORE="8" GDT_TEST_URL="http://127.0.0.1:8080/core/misc/drupal.js" CXX=g++-4.8
23-
- php: 5.6
24-
env: NVM_NODE_VERSION="node" GDT_DRUPAL_CORE="8" GDT_TEST_URL="http://127.0.0.1:8080/core/misc/drupal.js" CXX=g++-4.8
25-
- php: 7
26-
env: NVM_NODE_VERSION="node" GDT_DRUPAL_CORE="8" GDT_TEST_URL="http://127.0.0.1:8080/core/misc/drupal.js" CXX=g++-4.8
2720
exclude:
28-
- php: 5.4
29-
env: NVM_NODE_VERSION="4.3" GDT_DRUPAL_CORE="8" GDT_TEST_URL="http://127.0.0.1:8080/core/misc/drupal.js" CXX=g++-4.8
30-
- php: 5.4
31-
env: NVM_NODE_VERSION="node" GDT_DRUPAL_CORE="8" GDT_TEST_URL="http://127.0.0.1:8080/core/misc/drupal.js" CXX=g++-4.8
21+
# Skip Drupal 7 on PHP 7
22+
- php: 7
23+
env: NVM_NODE_VERSION="4" GDT_DRUPAL_CORE="7" GDT_TEST_URL="http://127.0.0.1:8080/misc/drupal.js" CXX=g++-4.8
24+
# Skip Node.js v5 with PHP 5.5 and PHP 7
25+
- php: 5.5
26+
env: NVM_NODE_VERSION="5" GDT_DRUPAL_CORE="8" GDT_TEST_URL="http://127.0.0.1:8080/core/misc/drupal.js" CXX=g++-4.8
3227
- php: 7
33-
env: NVM_NODE_VERSION="0.12" GDT_DRUPAL_CORE="7" GDT_TEST_URL="http://127.0.0.1:8080/misc/drupal.js" CXX=g++-4.8
28+
env: NVM_NODE_VERSION="5" GDT_DRUPAL_CORE="8" GDT_TEST_URL="http://127.0.0.1:8080/core/misc/drupal.js" CXX=g++-4.8
3429
before_install:
3530
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $NVM_NODE_VERSION
3631
- node --version
@@ -40,9 +35,10 @@ before_install:
4035
install:
4136
- npm install -g grunt-cli@^1.0.0
4237
- npm install -g mocha
43-
- ls -lRa
38+
- npm install
4439
script:
4540
- echo "Code checkout disk usage"; du -chs .
41+
- npm run lint
4642
- ./test/create_working_copy.sh
4743
- cd test/working_copy/
4844
- echo "Working copy disk usage"; du -chs .
@@ -58,5 +54,5 @@ script:
5854
- sleep 1; while (ps aux | grep '[b]ehat' > /dev/null); do sleep 1; done
5955
- for pid in `ps aux | grep drush | grep runserver | awk '{print $2}'`; do echo "Stopping drush pid $pid"; kill -SIGINT $pid; done;
6056
- grunt package --quiet
61-
- mocha --timeout 10000 node_modules/grunt-drupal-tasks/test/build.js
57+
- mocha --timeout 30000 node_modules/grunt-drupal-tasks/test/build.js
6258
- mocha node_modules/grunt-drupal-tasks/test/library.js

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# CHANGELOG
22

3+
## v1.0.0-pre
4+
5+
- Dropped support for Node.js v0.12 and earlier and PHP v5.4 and earlier.
6+
- Added support for a Composer build process for Drupal 8.
7+
- Removed built-in support for Compass theme compilation and Ruby bundle
8+
installation.
9+
- Added configuration for the Behat binary path. Add default configuration for
10+
the paths of the phpcs, phpmd, and Drush binaries. Changed configuration key
11+
from `drush.cmd` to `drush.path` for consistency.
12+
- Minor code refactoring and adopting code style standard.
13+
- Updated dependencies.
14+
15+
### Upgrade Notes
16+
17+
- Node.js v4 or later is required. Grunt Drupal Tasks is now compatible with
18+
Node.js v5.
19+
- PHP v5.5 or later is required.
20+
- Use of the built-in Compass theme compilation steps must be replaced by custom
21+
handling at the project- or theme-level.
22+
- Change the Gruntconfig.json configuration key `cmd` under `drush` to `path`,
23+
or if using the default path of `vendor/bin/drush`, remove the setting entirely.
24+
325
## v0.11.1 [2016/04/17]
426

527
- Fixed `grunt package` regression that custom code from the packaged outputs.

0 commit comments

Comments
 (0)