diff --git a/.travis.yml b/.travis.yml index d4b4dde..819196d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,10 +31,6 @@ jobs: - docker-compose run ${TARGET} - BUILDARCH=MOCK docker-compose run ${TARGET} - if [[ ${TARGET} != *"node"* ]]; then JSONPLAT=ON docker-compose run ${TARGET}; fi - - <<: *run-with-clang - env: TARGET=node4 - - <<: *run-with-clang - env: TARGET=node5 - <<: *run-with-clang env: TARGET=node6 - <<: *run-with-clang @@ -48,10 +44,6 @@ jobs: - docker-compose run ${TARGET} - BUILDARCH=MOCK docker-compose run ${TARGET} - if [[ ${TARGET} != *"node"* ]]; then JSONPLAT=ON docker-compose run ${TARGET}; fi - - <<: *run-with-gcc-5 - env: TARGET=node4 - - <<: *run-with-gcc-5 - env: TARGET=node5 - <<: *run-with-gcc-5 env: TARGET=node6 - <<: *run-with-gcc-5 @@ -65,10 +57,6 @@ jobs: - docker-compose run ${TARGET} - BUILDARCH=MOCK docker-compose run ${TARGET} - if [[ ${TARGET} != *"node"* ]]; then JSONPLAT=ON docker-compose run ${TARGET}; fi - - <<: *run-with-gcc-6 - env: TARGET=node4 - - <<: *run-with-gcc-6 - env: TARGET=node5 - <<: *run-with-gcc-6 env: TARGET=node6 - <<: *run-with-gcc-6 diff --git a/docker-compose.yaml b/docker-compose.yaml index 0f1e21e..3772b29 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -136,18 +136,10 @@ services: - BUILDARCH=PERIPHERALMAN command: bash -c "./scripts/build-android.sh" - node4: + node6: extends: base - image: inteliotdevkit/mraa-node4 + image: inteliotdevkit/mraa-node6 environment: - BUILDSWIG=ON - BUILDSWIGNODE=ON command: bash -c "./scripts/run-cmake.sh && make -Cbuild npmpkg && node-gyp configure && node-gyp build && npm test" - - node5: - extends: node4 - image: inteliotdevkit/mraa-node5 - - node6: - extends: node4 - image: inteliotdevkit/mraa-node6