Merge branch 'm31_MDL-61893_Accept_Any_Node_Carbon_Version-minimal' of …

…https://github.com/scara/moodle into MOODLE_31_STABLE
moodle · May 22, 2018 · c44b6e79fa988c83567a7f8c89f24f09794eaa2a · c44b6e7
2 parents 8137f98 + 81d5b79
commit c44b6e79fa988c83567a7f8c89f24f09794eaa2a
Unified Split

Showing with 2,079 additions and 730 deletions.

+1 −4 .travis.yml

+2,075 −726 npm-shrinkwrap.json

+3 −0 package.json
diff --git a/.travis.yml b/.travis.yml
@@ -45,12 +45,9 @@ matrix:
    fast_finish: true

    include:
-          # Run grunt/npm install on lowest supported npm version
-        - php: 7
-          env: DB=none     TASK=GRUNT   NVM_VERSION='0.10'
          # Run grunt/npm install on highest version ('node' is an alias for the latest node.js version.)
        - php: 7
-          env: DB=none     TASK=GRUNT   NVM_VERSION='node'
+          env: DB=none     TASK=GRUNT   NVM_VERSION='lts/carbon'

    exclude:
        # MySQL - it's just too slow.