From 84ccd16c1ca2adb46505c90741062d7e129f6e80 Mon Sep 17 00:00:00 2001 From: Mateusz Czeladka Date: Sun, 23 Jul 2017 16:05:21 +0200 Subject: [PATCH] New NodeJS: 7.10.1, new V8: 5.5.372.43 --- .travis.yml | 2 +- Jenkinsfile | 2 +- build-node.sh | 2 +- buildAll.sh | 2 +- build_settings.py | 4 ++-- releng/maven/build_and_deploy.sh | 4 ++-- src/test/java/com/eclipsesource/v8/NodeJSTest.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22e173030..aafcc7a6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ sudo: required services: docker -before_install: curl -O http://download.eclipsesource.com/j2v8/v8/node.out-7_4_0.tar.gz +before_install: curl -o node.out-7_10_1.tar.gz https://nodejs.org/dist/v7.10.1/node-v7.10.1-linux-x64.tar.gz script: ./buildAll.sh diff --git a/Jenkinsfile b/Jenkinsfile index 880c094c9..fb4683ce7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ node { } stage('Fetching target platform') { - sh 'curl -O http://download.eclipsesource.com/j2v8/v8/node.out-7_4_0.tar.gz' + sh 'curl -o node.out-7_10_1.tar.gz https://nodejs.org/dist/v7.10.1/node-v7.10.1-linux-x64.tar.gz' } stage('Building') { diff --git a/build-node.sh b/build-node.sh index b2a63c042..a558fea37 100644 --- a/build-node.sh +++ b/build-node.sh @@ -1,4 +1,4 @@ -git clone https://github.com/nodejs/node -b v7.4.0 +git clone https://github.com/nodejs/node -b v7.10.1 cd node ./configure --enable-static make diff --git a/buildAll.sh b/buildAll.sh index c6345d079..4425cf6f5 100755 --- a/buildAll.sh +++ b/buildAll.sh @@ -42,7 +42,7 @@ docker rm -f j2v8.android.arm_$DOCKER_CONTAINER_SUFFIX docker rm -f j2v8.linux.x64_$DOCKER_CONTAINER_SUFFIX set -e -tar xzf node.out-7_4_0.tar.gz +tar xzf node.out-7_10_1.tar.gz docker build -t "j2v8-linux-x64" -f docker/Dockerfile.linux $DIR docker run -e "env.J2V8_PLATFORM_NAME=linux" -e "env.J2V8_ARCH_NAME=x86_64" -e "env.J2V8_FULL_VERSION=4.8.0" -v $ROOTPATH:/build/. -v $ROOTPATH/node.out:/build/node --name j2v8.linux.x64_$DOCKER_CONTAINER_SUFFIX j2v8-linux-x64 diff --git a/build_settings.py b/build_settings.py index 399e13c14..09d288051 100644 --- a/build_settings.py +++ b/build_settings.py @@ -2,12 +2,12 @@ #----------------------------------------------------------------------- # Node.js settings #----------------------------------------------------------------------- -NODE_VERSION_MAJOR, NODE_VERSION_MINOR, NODE_VERSION_PATCH = 7, 4, 0 +NODE_VERSION_MAJOR, NODE_VERSION_MINOR, NODE_VERSION_PATCH = 7, 10, 1 #----------------------------------------------------------------------- # J2V8 settings #----------------------------------------------------------------------- -J2V8_VERSION_MAJOR, J2V8_VERSION_MINOR, J2V8_VERSION_PATCH = 4, 8, 0 +J2V8_VERSION_MAJOR, J2V8_VERSION_MINOR, J2V8_VERSION_PATCH = 4, 9, 0 J2V8_VERSION_SUFFIX = "-SNAPSHOT" #----------------------------------------------------------------------- diff --git a/releng/maven/build_and_deploy.sh b/releng/maven/build_and_deploy.sh index aec037b16..0993e170f 100755 --- a/releng/maven/build_and_deploy.sh +++ b/releng/maven/build_and_deploy.sh @@ -9,11 +9,11 @@ COMMIT_ID=`git rev-parse HEAD` sed s/Unknown\ revision\ ID/$COMMIT_ID/ ./src/main/java/com/eclipsesource/v8/V8.java > ./src/main/java/com/eclipsesource/v8/V8.java.updated mv ./src/main/java/com/eclipsesource/v8/V8.java.updated ./src/main/java/com/eclipsesource/v8/V8.java -TARGET_PLATFORM=$PWD/../../../node.out-7_4_0.tar.gz +TARGET_PLATFORM=$PWD/../../../node.out-7_10_1.tar.gz if [ -f $TARGET_PLATFORM ]; then cp $TARGET_PLATFORM . else - curl -O http://download.eclipsesource.com/j2v8/v8/node.out-7_4_0.tar.gz + curl -o node.out-7_10_1.tar.gz https://nodejs.org/dist/v7.10.1/node-v7.10.1-linux-x64.tar.gz fi ./buildAll.sh ./gradlew clean build uploadArchives -x test diff --git a/src/test/java/com/eclipsesource/v8/NodeJSTest.java b/src/test/java/com/eclipsesource/v8/NodeJSTest.java index 3d2aa95c7..a6817065c 100644 --- a/src/test/java/com/eclipsesource/v8/NodeJSTest.java +++ b/src/test/java/com/eclipsesource/v8/NodeJSTest.java @@ -66,7 +66,7 @@ public void run() { public void testGetVersion() { String result = nodeJS.getNodeVersion(); - assertEquals("7.4.0", result); + assertEquals("7.10.1", result); } @Test