merge ok

Author: Aschen

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "features/features"]
 	path = features/features
 	url = https://github.com/kuzzleio/sdk-features.git
-[submodule "doc/framework"]
-	path = doc/framework
-	url = https://github.com/kuzzleio/documentation

.travis.yml

@@ -12,6 +12,33 @@ jobs:
         # Codecov token
         secure: ATb4QFGG6sPkfquAoye6BeN7u4uQ4abP8qatVK8XG3Qof+pECZwRkFPVoopO1Gb/4bQSPfapc1aGPzGuKi409v633vpDnpcgM7cHX9CPT+YQYcTePMFtq/m+5YY3WIYWM1zCFmJ+bBwQO/MtsubfGfA9EmSAAxtnJV+1JDD3Y6+NQRkQN7K+gxQozec0u1W0Oe1sJXLSKlW3JPL8iRtKcLvmIDysKtBK6X/Wg1qP2Me4reb449a0yGej3QvZDbDYJbdlh7vuFLjXJAz3yExfED8QAm8wf0p9F8emILHnkLxjumTTnGUUqDJLLu8WgkahFiyFo4jMtryhNQ0+p6WhXmEbpNIO+yMGSZPsCGbnpkhWJ1aMAT6ZhgpHf4jDZQd4ZJi02+n9tOpe+Lm2Jk2LXY8SwMk3xGtqm5sk03weTc019TUGj/NLoHNjO/vfNz3xOImD5Gck3bXWNxdrX3bjiyVsr/u77enoWu9drPCEl3JOTIwVP3mTF8R3axSFOQ8M4SI1orCMChkGMB5qExl+Gfx+MHa/jL7QKO1SFRgl1O3DbhsyFE6xiabYzwLcdbI50ypy6VJjmDd5RxK7BkDa8RumlHT1uY1FK9yRXu4XFrrw9FjF2s+xjWbliRZqXRReXk0W1Hz4zj5au3Y9YH5a/UPtB72TY+AUUWHTUPQl3SU=
 
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - gcc-4.9
+            - g++-4.9
+
+      before_install:
+        - export CC="gcc-4.9" CXX="g++-4.9"
+
+      install:
+        - npm install
+
+      script:
+        - npm run lint
+        - npm run unit-testing
+
+      after_success:
+        - cat ./coverage/lcov.info | ./node_modules/.bin/codecov
+
+    - stage: Tests
+      name: Integration Tests
+      if: type = pull_request OR type = push AND branch =~ /^master|[0-9]+-(dev|stable)$/ OR type = cron
+      language: node_js
+      node_js: 8
+
       addons:
         apt:
           sources:
@@ -30,13 +57,11 @@ jobs:
 
       script:
         - npm run build
-        - npm test
-        
-      after_success:  
-        - cat ./coverage/lcov.info | ./node_modules/.bin/codecov
+        - npm run functional-testing
 
-    - name: Documentation tests
-      stage: Tests
+    - stage: Tests
+      name: Documentation Tests
+      if: type = pull_request OR type = push AND branch =~ /^master|[0-9]+-(dev|stable)$/ OR type = cron
       language: node_js
       node_js: 8
 
@@ -45,8 +70,19 @@ jobs:
       script:
         - npm run doc-testing
 
-    - stage: "Deploy Stable release on NPM"
-      if: type != pull_request && branch = master
+    - stage: Tests
+      name: Dead link check
+      if: type = pull_request OR type = push AND branch =~ /^master|[0-9]+-(dev|stable)$/ OR type = cron
+
+      before_script:
+        - npm run doc-prepare
+        - npm run --prefix doc/framework clone-repos
+      script:
+        - npm run --prefix doc/framework dead-links
+
+
+    - stage: Deploy Stable release on NPM
+      if: branch = master AND tag IS present AND type != cron
       sudo: false
       language: node_js
       node_js: 8
@@ -113,4 +149,3 @@ jobs:
             repo: kuzzleio/sdk-javascript
             all_branches: true
             condition: $TRAVIS_BRANCH =~ ^[0-9]+-beta$
-

doc/framework

@@ -1,13 +1,10 @@
 #!/bin/bash
 
-set -e
-
-echo "Init documentation framework submodule"
-git submodule init framework/
-git submodule update framework/
+echo "Clone documentation framework"
+git clone --depth 10 --single-branch --branch master https://github.com/kuzzleio/documentation.git framework/
 
 echo "Link local documentation"
-mkdir framework/.repos/sdk/sdk-javascript-6/doc/
-ln -s ../../../../../6 framework/.repos/sdk/sdk-javascript-6/doc/6
+rm framework/src/sdk/js/6 # remove link to submodule
+ln -s ../../../../6 framework/src/sdk/js/6 # use current documentation
 
 npm --prefix framework/ install