This is an automated email from the ASF dual-hosted git repository.
jin pushed a commit to branch pd-store
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
The following commit(s) were added to refs/heads/pd-store by this push:
new d6a254842 fix(server): github ci for submodule "server" (#2288)
d6a254842 is described below
commit d6a25484270d876ee308147c2ca4aec54fc42325
Author: M <[email protected]>
AuthorDate: Mon Aug 21 19:15:00 2023 +0800
fix(server): github ci for submodule "server" (#2288)
---
.github/outdated/.travis.yml | 2 +-
.github/workflows/check-dependencies.yml | 2 +-
.github/workflows/ci.yml | 2 +-
.../src/main/java/org/apache/hugegraph/version/ApiVersion.java | 2 +-
.../src/main/java/org/apache/hugegraph/version/CoreVersion.java | 2 +-
hugegraph-server/hugegraph-dist/scripts/apache-release.sh | 2 +-
hugegraph-server/hugegraph-dist/src/assembly/descriptor/assembly.xml | 2 +-
hugegraph-server/hugegraph-dist/src/assembly/jenkins/jenkins.sh | 2 +-
hugegraph-server/hugegraph-dist/src/assembly/travis/build-report.sh | 2 +-
.../hugegraph-dist/src/assembly/travis/install-mysql-via-docker.sh | 2 +-
.../src/assembly/travis/install-postgresql-via-docker.sh | 2 +-
.../hugegraph-dist/src/assembly/travis/install-postgresql.sh | 2 +-
.../hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh | 2 +-
hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test.sh | 3 +--
14 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/.github/outdated/.travis.yml b/.github/outdated/.travis.yml
index 4b5c57ad7..485fe441f 100644
--- a/.github/outdated/.travis.yml
+++ b/.github/outdated/.travis.yml
@@ -115,7 +115,7 @@ env:
global:
- RELEASE_BRANCH=^release-.*$
- RELEASE_TAG=^v[0-9]\..*$
- - TRAVIS_DIR=hugegraph-dist/src/assembly/travis
+ - TRAVIS_DIR=hugegraph-server/hugegraph-dist/src/assembly/travis
- DEPLOYED=0
- secure:
dYmFTVeEtRzLNaHp9ToTV/+CkTD0/rEj+K7dRN8wsv/yg4pbqwnyWbSXcqMlj6iNFzAz3nPbmFLCvAWON9/SMN9iJIT6x/xfcf+LqCT8QWczo2nc9xeX144ij2VHX1Drvtk5fRTMaTXRfWEQIrjqx2yrJTIdrXWzWSaZLFv1CRCUizEiGGCePnzUWxx9dBypNyC6IaH6lIv8uN5E6+10SYhb7UJGjWUMDg1bCeW9X7X2wg4QpsGDzlGFXT2EBPU/dAb5attTAtW8dKxrCZqZJTPWe0BarXDBR4PO15BC+a0V1g8LwexedtDjJeFRcGPaJ5NN4d3jDSusCzt5Jf4U0Wa1gDRMVTU3jT+KYkm5eoV4wOZMySobjh6VpQH/LyL0QTDy5apRPAxw+wO+tc91P+nkJmnlr3pN8abtMZ6NciZizUBYQRgR/m2Ir0stvtbZxBQOATuPtBgNDKiDgVdSYcRJzSqYEM
[...]
- secure:
XbX6AX5zDPc2PcWYAMW+6fazqRRUqpgQkt4eXUugLuVIYZBmJ0WqncEhJ4+mdwOGPIhnP2HsOaSeK2eE/O+iLY2XpBFbugoBgm9VaZlCC4CY1gRNHaanYg64Lrm3NPY3n08IHRMazHqMpJwUqNO+OG/6QwkepULQLj5Rluf716AoXHa7IEJhAIrwr+OXQvdEaJdUXlS1lRycXVeYtOewl7qYxCO4dD4RMhPlNykh9KEK7fd5wnPkiUsp1SwF4g5XsaLvGXmT/qQ1nj8oa9Caej/iaj6HMKG3BO057mq4KK5JDxTPWhBueNpEkUwldAnrMhYWLRnNf4IyjUsaB/Pmi6HspzcaiORPLYwPmdvLGGSnYwbtO+fAHebgpgOnj/vGmRmY4YtIkYdFtbPBI0HpbGB77tqNRFCe/5deLrjx0hXJBfoKTy7d42SI1eBhNR0svZYUHkSfuXwly6hMTlH1DN/bumMFxf
[...]
diff --git a/.github/workflows/check-dependencies.yml
b/.github/workflows/check-dependencies.yml
index 60185492b..4a2a7168d 100644
--- a/.github/workflows/check-dependencies.yml
+++ b/.github/workflows/check-dependencies.yml
@@ -14,7 +14,7 @@ jobs:
dependency-check:
runs-on: ubuntu-latest
env:
- SCRIPT_DEPENDENCY: hugegraph-dist/scripts/dependency
+ SCRIPT_DEPENDENCY: hugegraph-server/hugegraph-dist/scripts/dependency
steps:
- name: Checkout source
uses: actions/checkout@v3
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 414fd4a3f..e3435d5da 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
build:
runs-on: ubuntu-20.04
env:
- TRAVIS_DIR: hugegraph-dist/src/assembly/travis
+ TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
REPORT_DIR: target/site/jacoco
BACKEND: ${{ matrix.BACKEND }}
TRIGGER_BRANCH_NAME: ${{ github.ref_name }}
diff --git
a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java
b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java
index 117795c8d..969e9a3d6 100644
---
a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java
+++
b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/version/ApiVersion.java
@@ -123,6 +123,6 @@ public final class ApiVersion {
public static void check() {
// Check version of hugegraph-core. Firstly do check from version 0.3
- VersionUtil.check(CoreVersion.VERSION, "1.0", "1.1", CoreVersion.NAME);
+ VersionUtil.check(CoreVersion.VERSION, "1.0", "1.6", CoreVersion.NAME);
}
}
diff --git
a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/version/CoreVersion.java
b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/version/CoreVersion.java
index b47f944d8..480236ffb 100644
---
a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/version/CoreVersion.java
+++
b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/version/CoreVersion.java
@@ -29,7 +29,7 @@ public class CoreVersion {
public static final String NAME = "hugegraph-core";
- public static final String DEFAULT_VERSION = "1.0.0";
+ public static final String DEFAULT_VERSION = "1.5.0";
// The second parameter of Version.of() is for IDE running without JAR
public static final Version VERSION = Version.of(CoreVersion.class,
DEFAULT_VERSION);
diff --git a/hugegraph-server/hugegraph-dist/scripts/apache-release.sh
b/hugegraph-server/hugegraph-dist/scripts/apache-release.sh
index 463373ccd..a92a59b37 100755
--- a/hugegraph-server/hugegraph-dist/scripts/apache-release.sh
+++ b/hugegraph-server/hugegraph-dist/scripts/apache-release.sh
@@ -41,7 +41,7 @@ rm -rf dist && mkdir -p dist/apache-${REPO}
# step1: package the source code
cd ../../
git archive --format=tar.gz \
-
--output="hugegraph-dist/scripts/dist/apache-${REPO}/apache-${REPO}-incubating-${RELEASE_VERSION}-src.tar.gz"
\
+
--output="hugegraph-server/hugegraph-dist/scripts/dist/apache-${REPO}/apache-${REPO}-incubating-${RELEASE_VERSION}-src.tar.gz"
\
--prefix=apache-${REPO}-incubating-"${RELEASE_VERSION}"-src/ "${GIT_BRANCH}"
|| exit
cd - || exit
diff --git
a/hugegraph-server/hugegraph-dist/src/assembly/descriptor/assembly.xml
b/hugegraph-server/hugegraph-dist/src/assembly/descriptor/assembly.xml
index a5b300216..4ae2286aa 100644
--- a/hugegraph-server/hugegraph-dist/src/assembly/descriptor/assembly.xml
+++ b/hugegraph-server/hugegraph-dist/src/assembly/descriptor/assembly.xml
@@ -49,7 +49,7 @@
</includes>
</fileSet>
<fileSet>
-
<directory>${top.level.dir}/hugegraph-dist/release-docs/</directory>
+
<directory>${top.level.dir}/hugegraph-server/hugegraph-dist/release-docs/</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
diff --git a/hugegraph-server/hugegraph-dist/src/assembly/jenkins/jenkins.sh
b/hugegraph-server/hugegraph-dist/src/assembly/jenkins/jenkins.sh
index c177c03b7..559bf804b 100644
--- a/hugegraph-server/hugegraph-dist/src/assembly/jenkins/jenkins.sh
+++ b/hugegraph-server/hugegraph-dist/src/assembly/jenkins/jenkins.sh
@@ -18,7 +18,7 @@
# Backends contains [memory, rocksdb, cassandra, scylladb, mysql]
export BACKEND=memory
# The jenkins script store path
-export SCRIPT_DIR="hugegraph-dist/src/assembly/jenkins"
+export SCRIPT_DIR="hugegraph-server/hugegraph-dist/src/assembly/jenkins"
# The jenkins job integrated behavior: [test, deploy, publish]
export ACTION=${ACTION}
diff --git
a/hugegraph-server/hugegraph-dist/src/assembly/travis/build-report.sh
b/hugegraph-server/hugegraph-dist/src/assembly/travis/build-report.sh
index 7d518334f..5420b510f 100755
--- a/hugegraph-server/hugegraph-dist/src/assembly/travis/build-report.sh
+++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/build-report.sh
@@ -27,7 +27,7 @@ if [ "$BACKEND" == "memory" ]; then
OPTION_CLASS_FILES_BACKEND=""
fi
-cd hugegraph-test
+cd hugegraph-server/hugegraph-test
mvn jacoco:dump@pull-test-data -Dapp.host=localhost -Dapp.port=$JACOCO_PORT
-Dskip.dump=false
cd ../
diff --git
a/hugegraph-server/hugegraph-dist/src/assembly/travis/install-mysql-via-docker.sh
b/hugegraph-server/hugegraph-dist/src/assembly/travis/install-mysql-via-docker.sh
index ade8170d6..7239098cd 100755
---
a/hugegraph-server/hugegraph-dist/src/assembly/travis/install-mysql-via-docker.sh
+++
b/hugegraph-server/hugegraph-dist/src/assembly/travis/install-mysql-via-docker.sh
@@ -20,7 +20,7 @@ set -ev
TRAVIS_DIR=$(dirname "$0")
# Need speed up it
-CONF=hugegraph-test/src/main/resources/hugegraph.properties
+CONF=hugegraph-server/hugegraph-test/src/main/resources/hugegraph.properties
MYSQL_USERNAME=root
# Set MySQL configurations
diff --git
a/hugegraph-server/hugegraph-dist/src/assembly/travis/install-postgresql-via-docker.sh
b/hugegraph-server/hugegraph-dist/src/assembly/travis/install-postgresql-via-docker.sh
index d9354e470..62d35d283 100755
---
a/hugegraph-server/hugegraph-dist/src/assembly/travis/install-postgresql-via-docker.sh
+++
b/hugegraph-server/hugegraph-dist/src/assembly/travis/install-postgresql-via-docker.sh
@@ -18,7 +18,7 @@
set -ev
TRAVIS_DIR=$(dirname "$0")
-CONF=hugegraph-test/src/main/resources/hugegraph.properties
+CONF=hugegraph-server/hugegraph-test/src/main/resources/hugegraph.properties
POSTGRESQL_DRIVER=org.postgresql.Driver
POSTGRESQL_URL=jdbc:postgresql://localhost:5432/
diff --git
a/hugegraph-server/hugegraph-dist/src/assembly/travis/install-postgresql.sh
b/hugegraph-server/hugegraph-dist/src/assembly/travis/install-postgresql.sh
index 12185e830..04562c18a 100755
--- a/hugegraph-server/hugegraph-dist/src/assembly/travis/install-postgresql.sh
+++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/install-postgresql.sh
@@ -18,7 +18,7 @@
set -ev
TRAVIS_DIR=$(dirname "$0")
-CONF=hugegraph-test/src/main/resources/hugegraph.properties
+CONF=hugegraph-server/hugegraph-test/src/main/resources/hugegraph.properties
POSTGRESQL_DRIVER=org.postgresql.Driver
POSTGRESQL_URL=jdbc:postgresql://localhost:5432/
diff --git
a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh
b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh
index 1c0eaaf16..bf9c29818 100755
---
a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh
+++
b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test-for-raft.sh
@@ -23,7 +23,7 @@ REPORT_FILE=$REPORT_DIR/jacoco-api-test.xml
TRAVIS_DIR=`dirname $0`
VERSION=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`
-SERVER_DIR=apache-hugegraph-incubating-$VERSION
+SERVER_DIR=hugegraph-server/apache-hugegraph-incubating-$VERSION
RAFT1_DIR=hugegraph-raft1
RAFT2_DIR=hugegraph-raft2
RAFT3_DIR=hugegraph-raft3
diff --git
a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test.sh
b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test.sh
index c856ac54b..0059c2f11 100755
--- a/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test.sh
+++ b/hugegraph-server/hugegraph-dist/src/assembly/travis/run-api-test.sh
@@ -23,7 +23,7 @@ REPORT_FILE=$REPORT_DIR/jacoco-api-test-for-raft.xml
TRAVIS_DIR=$(dirname $0)
VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-SERVER_DIR=apache-hugegraph-incubating-$VERSION
+SERVER_DIR=hugegraph-server/apache-hugegraph-incubating-$VERSION/
CONF=$SERVER_DIR/conf/graphs/hugegraph.properties
REST_SERVER_CONF=$SERVER_DIR/conf/rest-server.properties
GREMLIN_SERVER_CONF=$SERVER_DIR/conf/gremlin-server.yaml
@@ -31,7 +31,6 @@ JACOCO_PORT=36320
mvn package -DskipTests -ntp
-
# add mysql dependency
wget -P $SERVER_DIR/lib/
https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.28/mysql-connector-java-8.0.28.jar
