From 8b14a7cc4a6e0e4d9fffacfaa8ca08c7a0103504 Mon Sep 17 00:00:00 2001 From: liuxiao Date: Thu, 30 Nov 2023 17:51:09 +0800 Subject: [PATCH 1/9] fix(client): server api version mismatch --- .../org/apache/hugegraph/driver/HugeClient.java | 2 +- hugegraph-hubble/dist.sh | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 hugegraph-hubble/dist.sh diff --git a/hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java index e3c9045bf..70893d0f1 100644 --- a/hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java @@ -109,7 +109,7 @@ private void initManagers(RestClient client, String graph) { private void checkServerApiVersion() { VersionUtil.Version apiVersion = VersionUtil.Version.of(this.version.getApiVersion()); - VersionUtil.check(apiVersion, "0.38", "0.70", "hugegraph-api in server"); + VersionUtil.check(apiVersion, "0.38", "0.72", "hugegraph-api in server"); this.client.apiVersion(apiVersion); } diff --git a/hugegraph-hubble/dist.sh b/hugegraph-hubble/dist.sh new file mode 100644 index 000000000..e27124005 --- /dev/null +++ b/hugegraph-hubble/dist.sh @@ -0,0 +1,14 @@ +cd /home/root1/lx/Development/incubator-hugegraph-toolchain/hugegraph-hubble/hubble-dist/../hubble-fe || exit 1 + export CI=false + yarn install --network-timeout 600000 && yarn build || exit 1 + echo -e "Hubble-FE build successfully.\n" + + cd /home/root1/lx/Development/incubator-hugegraph-toolchain/hugegraph-hubble/hubble-dist/.. && pwd + rm -rf apache-hugegraph-hubble-incubating-1.0.0/ui + cp -r /home/root1/lx/Development/incubator-hugegraph-toolchain/hugegraph-hubble/hubble-dist/../hubble-fe/build apache-hugegraph-hubble-incubating-1.0.0/ui + + tar -zcvf /home/root1/lx/Development/incubator-hugegraph-toolchain/hugegraph-hubble/hubble-dist/../target/apache-hugegraph-hubble-incubating-1.0.0.tar.gz apache-hugegraph-hubble-incubating-1.0.0 || exit 1 + cp -r apache-hugegraph-hubble-incubating-1.0.0 ./hubble-dist + echo -n "apache-hugegraph-hubble-incubating-1.0.0 tar.gz available at: " + echo "/home/root1/lx/Development/incubator-hugegraph-toolchain/hugegraph-hubble/hubble-dist/../target/apache-hugegraph-hubble-incubating-1.0.0.tar.gz" + rm -f /home/root1/lx/Development/incubator-hugegraph-toolchain/hugegraph-hubble/hubble-dist/../dist.sh \ No newline at end of file From 4397292b54b162405efaae5dc60eb04a586d10ff Mon Sep 17 00:00:00 2001 From: liuxiao Date: Thu, 30 Nov 2023 17:52:36 +0800 Subject: [PATCH 2/9] revert --- hugegraph-hubble/dist.sh | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 hugegraph-hubble/dist.sh diff --git a/hugegraph-hubble/dist.sh b/hugegraph-hubble/dist.sh deleted file mode 100644 index e27124005..000000000 --- a/hugegraph-hubble/dist.sh +++ /dev/null @@ -1,14 +0,0 @@ -cd /home/root1/lx/Development/incubator-hugegraph-toolchain/hugegraph-hubble/hubble-dist/../hubble-fe || exit 1 - export CI=false - yarn install --network-timeout 600000 && yarn build || exit 1 - echo -e "Hubble-FE build successfully.\n" - - cd /home/root1/lx/Development/incubator-hugegraph-toolchain/hugegraph-hubble/hubble-dist/.. && pwd - rm -rf apache-hugegraph-hubble-incubating-1.0.0/ui - cp -r /home/root1/lx/Development/incubator-hugegraph-toolchain/hugegraph-hubble/hubble-dist/../hubble-fe/build apache-hugegraph-hubble-incubating-1.0.0/ui - - tar -zcvf /home/root1/lx/Development/incubator-hugegraph-toolchain/hugegraph-hubble/hubble-dist/../target/apache-hugegraph-hubble-incubating-1.0.0.tar.gz apache-hugegraph-hubble-incubating-1.0.0 || exit 1 - cp -r apache-hugegraph-hubble-incubating-1.0.0 ./hubble-dist - echo -n "apache-hugegraph-hubble-incubating-1.0.0 tar.gz available at: " - echo "/home/root1/lx/Development/incubator-hugegraph-toolchain/hugegraph-hubble/hubble-dist/../target/apache-hugegraph-hubble-incubating-1.0.0.tar.gz" - rm -f /home/root1/lx/Development/incubator-hugegraph-toolchain/hugegraph-hubble/hubble-dist/../dist.sh \ No newline at end of file From 255602b2b04de82b9f5bfc8a264c32b3b9f62d6c Mon Sep 17 00:00:00 2001 From: liuxiao Date: Thu, 30 Nov 2023 18:43:49 +0800 Subject: [PATCH 3/9] update commit id --- .github/workflows/client-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml index e414921d1..a70375a16 100644 --- a/.github/workflows/client-ci.yml +++ b/.github/workflows/client-ci.yml @@ -23,7 +23,7 @@ jobs: env: USE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-client/assembly/travis - COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314 + COMMIT_ID: ed493f3093eab293a75cd2f539e29ca11fa6cd81 strategy: fail-fast: false matrix: From 9846cfa150c1e7119cb9f2ff8187c21fd0ea4611 Mon Sep 17 00:00:00 2001 From: liuxiao Date: Thu, 30 Nov 2023 18:46:19 +0800 Subject: [PATCH 4/9] update commit ids --- .github/workflows/hubble-ci.yml | 2 +- .github/workflows/loader-ci.yml | 2 +- .github/workflows/tools-ci.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/hubble-ci.yml b/.github/workflows/hubble-ci.yml index c07078c1a..cda2a7505 100644 --- a/.github/workflows/hubble-ci.yml +++ b/.github/workflows/hubble-ci.yml @@ -23,7 +23,7 @@ on: env: TRAVIS_DIR: hugegraph-hubble/hubble-dist/assembly/travis # TODO: need update it later (eed6103359fe40d2f1476fb8c56d9388c3111a99) - COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314 + COMMIT_ID: ed493f3093eab293a75cd2f539e29ca11fa6cd81 jobs: hubble-ci: diff --git a/.github/workflows/loader-ci.yml b/.github/workflows/loader-ci.yml index d3132a317..ffe72f46b 100644 --- a/.github/workflows/loader-ci.yml +++ b/.github/workflows/loader-ci.yml @@ -25,7 +25,7 @@ jobs: USE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-loader/assembly/travis STATIC_DIR: hugegraph-loader/assembly/static - COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314 + COMMIT_ID: ed493f3093eab293a75cd2f539e29ca11fa6cd81 DB_USER: root DB_PASS: root DB_DATABASE: load_test diff --git a/.github/workflows/tools-ci.yml b/.github/workflows/tools-ci.yml index f0e66625f..d95282522 100644 --- a/.github/workflows/tools-ci.yml +++ b/.github/workflows/tools-ci.yml @@ -24,7 +24,7 @@ jobs: USE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-tools/assembly/travis # TODO: could we use one param to unify it? or use a action template (could use one ci file) - COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314 + COMMIT_ID: ed493f3093eab293a75cd2f539e29ca11fa6cd81 steps: - name: Install JDK 11 uses: actions/setup-java@v3 From 5d6f1c3b8181691e84a193f63d97ecb8866d3ffd Mon Sep 17 00:00:00 2001 From: liuxiao Date: Thu, 30 Nov 2023 18:59:16 +0800 Subject: [PATCH 5/9] satisfy module --- .../assembly/travis/install-hugegraph-from-source.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh index fe9024077..028923f37 100755 --- a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh +++ b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh @@ -32,9 +32,10 @@ git checkout "${COMMIT_ID}" mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp # TODO: lack incubator after apache package release (update it later) +cd hugegraph-server TAR=$(echo apache-hugegraph-*.tar.gz) -tar zxf "${TAR}" -C ../ -cd ../ +tar zxf "${TAR}" -C ../../ +cd ../../ rm -rf "${GIT_DIR}" # TODO: lack incubator after apache package release (update it later) HTTP_SERVER_DIR=$(echo apache-hugegraph-*.*) From ed5e7f83bf7861c7a1f640c1d8476b60dee60c3a Mon Sep 17 00:00:00 2001 From: Simon Cheung Date: Tue, 5 Dec 2023 13:12:05 +0800 Subject: [PATCH 6/9] Update install-hugegraph-from-source.sh --- .../assembly/travis/install-hugegraph-from-source.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh index 93c4df96c..400b84723 100755 --- a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh +++ b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh @@ -61,5 +61,5 @@ echo "gremlinserver.url=http://127.0.0.1:8282" >> ${REST_SERVER_CONFIG} # start HugeGraphServer with https protocol bin/init-store.sh -bin/start-hugegraph.sh +bin/start-hugegraph.sh -t 60 cd ../ From fd637ab75e8e077a30ee8557b41e7f555b2047fd Mon Sep 17 00:00:00 2001 From: Simon Cheung Date: Tue, 5 Dec 2023 13:16:21 +0800 Subject: [PATCH 7/9] Update install-hugegraph-from-source.sh --- .../assembly/travis/install-hugegraph-from-source.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh index 400b84723..6a9d3ae7e 100755 --- a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh +++ b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh @@ -61,5 +61,5 @@ echo "gremlinserver.url=http://127.0.0.1:8282" >> ${REST_SERVER_CONFIG} # start HugeGraphServer with https protocol bin/init-store.sh -bin/start-hugegraph.sh -t 60 +bin/start-hugegraph.sh -t 120 cd ../ From 6b34118fc2d71d79984a0d7e0280c7370e948b63 Mon Sep 17 00:00:00 2001 From: Simon Cheung Date: Wed, 6 Dec 2023 09:24:32 +0800 Subject: [PATCH 8/9] Update client-ci.yml --- .github/workflows/client-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml index 8446d1da5..980fb5905 100644 --- a/.github/workflows/client-ci.yml +++ b/.github/workflows/client-ci.yml @@ -24,7 +24,7 @@ jobs: env: USE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-client/assembly/travis - COMMIT_ID: ed493f3093eab293a75cd2f539e29ca11fa6cd81 + COMMIT_ID: e8fb2696d6154f20fd4d6e45ca58763e69145116 strategy: fail-fast: false From d02ec7ef3ba22136dc6c68ed9709329b52649159 Mon Sep 17 00:00:00 2001 From: Simon Cheung Date: Thu, 7 Dec 2023 12:29:03 +0800 Subject: [PATCH 9/9] Update client-ci.yml --- .github/workflows/client-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml index 980fb5905..1a85911e3 100644 --- a/.github/workflows/client-ci.yml +++ b/.github/workflows/client-ci.yml @@ -24,7 +24,7 @@ jobs: env: USE_STAGE: 'true' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-client/assembly/travis - COMMIT_ID: e8fb2696d6154f20fd4d6e45ca58763e69145116 + COMMIT_ID: 47aa8be8508293bbda76c93b461292efc84a75c7 strategy: fail-fast: false