Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(client): increase the api num as the latest server commit + 10 #546

Merged
merged 5 commits into from
Dec 5, 2023
Merged

chore(client): increase the api num as the latest server commit + 10 #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
340ede2
fix: the api version is outdated
aroundabout Dec 4, 2023
4d6fd5d
fix dockerfile to aviod hubble use client:1.0.0
aroundabout Dec 4, 2023
60e0407
Update hugegraph-client/src/main/java/org/apache/hugegraph/driver/Hug…
aroundabout Dec 4, 2023
07a1a7c
fix: increase the depth for git clone
aroundabout Dec 5, 2023
5f5285e
Update hugegraph-client/src/main/java/org/apache/hugegraph/driver/Hug…
aroundabout Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/client-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ jobs:
mvn test -Dtest=FuncTestSuite

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3.0.0
uses: codecov/codecov-action@v3
with:
file: target/jacoco.xml
2 changes: 1 addition & 1 deletion hugegraph-client/assembly/travis/install-hugegraph-from-source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ HUGEGRAPH_GIT_URL="https://github.com/apache/hugegraph.git"
GIT_DIR=hugegraph

# download code and compile
git clone --depth 100 ${HUGEGRAPH_GIT_URL} $GIT_DIR
git clone --depth 150 ${HUGEGRAPH_GIT_URL} $GIT_DIR
cd "${GIT_DIR}"
git checkout "${COMMIT_ID}"
mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp
Expand Down
4 changes: 3 additions & 1 deletion hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ 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");
// TODO: find a way to keep the range of api version correct automatically
// 0.81 equals to the {latest_api_version} +10
VersionUtil.check(apiVersion, "0.38", "0.81", "hugegraph-api in server");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a comment for it (like why we need keep it as realNum ＋ 10)

aroundabout marked this conversation as resolved.
Show resolved Hide resolved
this.client.apiVersion(apiVersion);
}

Expand Down
3 changes: 3 additions & 0 deletions hugegraph-hubble/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ RUN set -x \
COPY . /pkg
WORKDIR /pkg

RUN set -x \
&& mvn install -pl hugegraph-client,hugegraph-loader -am -Dmaven.javadoc.skip=true -DskipTests -ntp

RUN set -x \
&& cd /pkg/hugegraph-hubble/ \
&& mvn package -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true
Expand Down
2 changes: 1 addition & 1 deletion hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ HUGEGRAPH_GIT_URL="https://github.com/apache/hugegraph.git"
GIT_DIR=hugegraph

# download code and compile
git clone --depth 100 $HUGEGRAPH_GIT_URL $GIT_DIR
git clone --depth 150 $HUGEGRAPH_GIT_URL $GIT_DIR
cd "${GIT_DIR}"
git checkout "${COMMIT_ID}"
mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp
Expand Down
2 changes: 1 addition & 1 deletion hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fi
COMMIT_ID=$1
HUGEGRAPH_GIT_URL="https://github.com/apache/hugegraph.git"

git clone --depth 100 ${HUGEGRAPH_GIT_URL} hugegraph
git clone --depth 150 ${HUGEGRAPH_GIT_URL} hugegraph
cd hugegraph
git checkout "${COMMIT_ID}"
mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp
Expand Down
2 changes: 1 addition & 1 deletion hugegraph-tools/assembly/travis/install-hugegraph-from-source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ HUGEGRAPH_GIT_URL="https://github.com/apache/hugegraph.git"
GIT_DIR=hugegraph

# download code and compile
git clone --depth 100 $HUGEGRAPH_GIT_URL $GIT_DIR
git clone --depth 150 $HUGEGRAPH_GIT_URL $GIT_DIR
cd "${GIT_DIR}"
git checkout "${COMMIT_ID}"
mvn package -DskipTests -Dmaven.javadoc.skip=true -ntp
Expand Down
Loading