From b713f2ee1a987daa1aeb52651afd67ed2e282771 Mon Sep 17 00:00:00 2001 From: imbajin Date: Tue, 13 Oct 2026 10:10:03 +0800 Subject: [PATCH 1/3] fix: omit documentation images from releases Exclude GitHub and Hubble documentation screenshots from git archives. Keep frontend public and source assets available for builds. Reuse export-ignore without adding packaging scripts. --- .gitattributes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitattributes b/.gitattributes index 2638b09a5..60606c23a 100755 --- a/.gitattributes +++ b/.gitattributes @@ -14,3 +14,7 @@ hugegraph-dist/scripts/ export-ignore .serena/ export-ignore # only exclude the root /assembly/ export-ignore + +# Exclude documentation screenshots; keep Hubble frontend assets for builds. +/.github/images/ export-ignore +/hugegraph-hubble/docs/images/ export-ignore From f3d7ac7ad47a4446c77c32f921f76cba95bc3209 Mon Sep 17 00:00:00 2001 From: imbajin Date: Tue, 13 Oct 2026 10:25:33 +0800 Subject: [PATCH 2/3] refactor: keep release helpers outside GitHub Move existing SDK and Server fixture helpers into source-owned paths. Exclude the complete GitHub directory from source archives. Update callers, CI, Docker contexts and documentation links without changing validation behavior. --- .dockerignore | 5 +---- .gitattributes | 4 +--- .github/actions/setup-candidate-sdk/action.yml | 2 +- .github/actions/setup-hugegraph-server/action.yml | 6 +++--- .github/actions/setup-hugegraph-server/runtime_test.py | 9 +++++---- .github/scripts/build-java17-image.sh | 2 +- .github/scripts/java17_image.py | 3 ++- .github/scripts/test_candidate_sdk.py | 6 ++++-- .github/scripts/test_java17_image.py | 2 ++ .github/workflows/java17-images-ci.yml | 2 ++ .github/workflows/upstream-compatibility.yml | 2 +- README.md | 4 ++-- docs/java17-migration.md | 2 +- .../assembly/travis}/fixture.sh | 2 +- .../assembly/travis/install-hugegraph-from-source.sh | 4 ++-- .../assembly/travis}/manifest.py | 6 +++--- .../assembly/travis}/release.py | 0 .../assembly/travis}/service-wait.sh | 0 .../assembly/travis/start-hugegraph-servers.sh | 2 +- hugegraph-dist/pom.xml | 6 +++--- hugegraph-hubble/Dockerfile | 6 +++--- hugegraph-hubble/README.md | 8 ++++---- .../hubble-dist/assembly/travis/download-hugegraph.sh | 2 +- .../travis/hugegraph-server1/install-hugegraph.sh | 2 +- .../travis/hugegraph-server2/install-hugegraph.sh | 2 +- hugegraph-hubble/hubble-dist/pom.xml | 2 +- hugegraph-loader/Dockerfile | 6 +++--- .../assembly/travis/install-hugegraph-from-source.sh | 4 ++-- hugegraph-loader/pom.xml | 2 +- hugegraph-tools/pom.xml | 2 +- {.github/scripts => tools}/verify_candidate_image_sdk.py | 0 31 files changed, 54 insertions(+), 51 deletions(-) rename {.github/actions/setup-hugegraph-server => hugegraph-client/assembly/travis}/fixture.sh (97%) rename {.github/actions/setup-hugegraph-server => hugegraph-client/assembly/travis}/manifest.py (95%) rename {.github/actions/setup-hugegraph-server => hugegraph-client/assembly/travis}/release.py (100%) rename {.github/actions/setup-hugegraph-server => hugegraph-client/assembly/travis}/service-wait.sh (100%) rename {.github/scripts => tools}/verify_candidate_image_sdk.py (100%) diff --git a/.dockerignore b/.dockerignore index d986f37c3..af6405a34 100644 --- a/.dockerignore +++ b/.dockerignore @@ -15,10 +15,7 @@ # Version-control and local development metadata .git -.github/** -!.github/scripts/ -.github/scripts/** -!.github/scripts/verify_candidate_image_sdk.py +.github .idea .vscode .codex-task diff --git a/.gitattributes b/.gitattributes index 60606c23a..a2b1a2dfc 100755 --- a/.gitattributes +++ b/.gitattributes @@ -8,13 +8,11 @@ apache-release.sh export-ignore .licenserc.yaml export-ignore # ignored directory -.github/workflows/ export-ignore -.github/outdated/ export-ignore +.github/ export-ignore hugegraph-dist/scripts/ export-ignore .serena/ export-ignore # only exclude the root /assembly/ export-ignore # Exclude documentation screenshots; keep Hubble frontend assets for builds. -/.github/images/ export-ignore /hugegraph-hubble/docs/images/ export-ignore diff --git a/.github/actions/setup-candidate-sdk/action.yml b/.github/actions/setup-candidate-sdk/action.yml index 849486966..82de151e2 100644 --- a/.github/actions/setup-candidate-sdk/action.yml +++ b/.github/actions/setup-candidate-sdk/action.yml @@ -78,7 +78,7 @@ runs: exit 1 fi CANDIDATE_SOURCE_COMMIT="$SERVER_COMMIT" \ - python3 "$GITHUB_WORKSPACE/.github/scripts/verify_candidate_image_sdk.py" "$candidate_repo" \ + python3 "$GITHUB_WORKSPACE/tools/verify_candidate_image_sdk.py" "$candidate_repo" \ --configure-upstream-env "$GITHUB_ENV" manifest_artifact_id=$(python3 -c 'import uuid; print(uuid.uuid4().hex)') archive_sha=$(sha256sum "${archives[0]}" | cut -d ' ' -f 1) diff --git a/.github/actions/setup-hugegraph-server/action.yml b/.github/actions/setup-hugegraph-server/action.yml index 42e1a2b1d..3776afac7 100644 --- a/.github/actions/setup-hugegraph-server/action.yml +++ b/.github/actions/setup-hugegraph-server/action.yml @@ -45,7 +45,7 @@ runs: uses: actions/cache@v4 with: path: ~/hugegraph-fixture-cache - key: server-fixture-v2-${{ runner.os }}-${{ runner.arch }}-${{ inputs.repository }}-${{ inputs.commit-id }}-release${{ inputs.release-version }}-jdk${{ inputs.java-version }}-${{ hashFiles('.github/actions/setup-hugegraph-server/action.yml', '.github/actions/setup-hugegraph-server/fixture.sh', '.github/actions/setup-hugegraph-server/manifest.py', '.github/actions/setup-hugegraph-server/release.py', '.github/actions/setup-java-env/action.yml', '.github/configs/settings.xml', 'hugegraph-client/assembly/travis/checkout-server.sh', 'hugegraph-client/assembly/travis/install-candidate-sdk.sh', 'hugegraph-client/assembly/travis/start-hugegraph-servers.sh', 'hugegraph-client/assembly/travis/tls-fixture.sh', 'hugegraph-*/assembly/travis/install-hugegraph-from-source.sh', 'hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh') }} + key: server-fixture-v2-${{ runner.os }}-${{ runner.arch }}-${{ inputs.repository }}-${{ inputs.commit-id }}-release${{ inputs.release-version }}-jdk${{ inputs.java-version }}-${{ hashFiles('.github/actions/setup-hugegraph-server/action.yml', 'hugegraph-client/assembly/travis/fixture.sh', 'hugegraph-client/assembly/travis/manifest.py', 'hugegraph-client/assembly/travis/release.py', '.github/actions/setup-java-env/action.yml', '.github/configs/settings.xml', 'hugegraph-client/assembly/travis/checkout-server.sh', 'hugegraph-client/assembly/travis/install-candidate-sdk.sh', 'hugegraph-client/assembly/travis/start-hugegraph-servers.sh', 'hugegraph-client/assembly/travis/tls-fixture.sh', 'hugegraph-*/assembly/travis/install-hugegraph-from-source.sh', 'hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh') }} - name: Prepare fixture or start service shell: bash env: @@ -53,7 +53,7 @@ runs: FIXTURE_REPOSITORY: ${{ inputs.repository }} FIXTURE_COMMIT: ${{ inputs.commit-id }} FIXTURE_REF: ${{ inputs.fetch-ref }} - FIXTURE_BUILD_INPUTS: ${{ hashFiles('.github/actions/setup-hugegraph-server/action.yml', '.github/actions/setup-hugegraph-server/fixture.sh', '.github/actions/setup-hugegraph-server/manifest.py', '.github/actions/setup-hugegraph-server/release.py', '.github/actions/setup-java-env/action.yml', '.github/configs/settings.xml', 'hugegraph-client/assembly/travis/checkout-server.sh', 'hugegraph-client/assembly/travis/install-candidate-sdk.sh', 'hugegraph-client/assembly/travis/start-hugegraph-servers.sh', 'hugegraph-client/assembly/travis/tls-fixture.sh', 'hugegraph-*/assembly/travis/install-hugegraph-from-source.sh', 'hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh') }} + FIXTURE_BUILD_INPUTS: ${{ hashFiles('.github/actions/setup-hugegraph-server/action.yml', 'hugegraph-client/assembly/travis/fixture.sh', 'hugegraph-client/assembly/travis/manifest.py', 'hugegraph-client/assembly/travis/release.py', '.github/actions/setup-java-env/action.yml', '.github/configs/settings.xml', 'hugegraph-client/assembly/travis/checkout-server.sh', 'hugegraph-client/assembly/travis/install-candidate-sdk.sh', 'hugegraph-client/assembly/travis/start-hugegraph-servers.sh', 'hugegraph-client/assembly/travis/tls-fixture.sh', 'hugegraph-*/assembly/travis/install-hugegraph-from-source.sh', 'hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh') }} FIXTURE_PLATFORM: ${{ runner.os }}-${{ runner.arch }} FIXTURE_JAVA: ${{ inputs.java-version }} FIXTURE_RELEASE_VERSION: ${{ inputs.release-version }} @@ -63,7 +63,7 @@ runs: SERVER_REPOSITORY: ${{ inputs.repository }} SERVER_FETCH_REF: ${{ inputs.fetch-ref }} TRAVIS_DIR: ${{ inputs.travis-dir }} - FIXTURE_ACTION: ${{ github.action_path }} + FIXTURE_ACTION: ${{ github.workspace }}/hugegraph-client/assembly/travis FIXTURE_ARTIFACT: ${{ inputs.artifact-name }} run: | set -euo pipefail diff --git a/.github/actions/setup-hugegraph-server/runtime_test.py b/.github/actions/setup-hugegraph-server/runtime_test.py index 024d2b79a..7943a33c8 100644 --- a/.github/actions/setup-hugegraph-server/runtime_test.py +++ b/.github/actions/setup-hugegraph-server/runtime_test.py @@ -28,6 +28,7 @@ HERE = Path(__file__).resolve().parent ROOT = HERE.parents[2] +HELPERS = ROOT / "hugegraph-client/assembly/travis" SHA = 'b12425c2032bf0d21a97b8221f42a18055c2982f' class RuntimeTests(unittest.TestCase): @@ -39,8 +40,8 @@ def setUp(self): self.action = self.dir / 'action' self.action.mkdir() for name in ('fixture.sh', 'manifest.py', 'release.py', 'service-wait.sh'): - shutil.copyfile(HERE / name, self.action / name) - spec = importlib.util.spec_from_file_location('fixture_release', HERE / 'release.py') + shutil.copyfile(HELPERS / name, self.action / name) + spec = importlib.util.spec_from_file_location('fixture_release', HELPERS / 'release.py') self.release = importlib.util.module_from_spec(spec) spec.loader.exec_module(self.release) checksum = hashlib.sha512(b'archive').hexdigest() @@ -145,7 +146,7 @@ def test_composite_step_isolates_fixture_jdk_from_caller(self): self.assertIn('Fixture JDK mismatch', result.stderr) def test_legacy_bash_service_deadline_and_success(self): - helper = str(HERE/'service-wait.sh') + helper = str(HELPERS/'service-wait.sh') self.command('curl', 'exit 1\n') result = subprocess.run( ['bash','-c',f'source "{helper}"; fixture_wait http://localhost:1'], @@ -211,7 +212,7 @@ def log_message(self, *args): self.addCleanup(server.server_close) self.addCleanup(server.shutdown) Thread(target=server.serve_forever, daemon=True).start() - helper = str(HERE/'service-wait.sh') + helper = str(HELPERS/'service-wait.sh') result = subprocess.run(['bash','-c',f'source "{helper}"; fixture_wait http://127.0.0.1:{server.server_port}'], env=self.env, capture_output=True, timeout=5) self.assertEqual(result.returncode, 0, result.stderr) diff --git a/.github/scripts/build-java17-image.sh b/.github/scripts/build-java17-image.sh index 7e8841691..ec5710e1a 100644 --- a/.github/scripts/build-java17-image.sh +++ b/.github/scripts/build-java17-image.sh @@ -41,7 +41,7 @@ trap report_failure ERR mkdir -p "$work/builder/repository/org/apache" phase="verify candidate SDK" phase_log="$evidence/sdk-verification.log" -python3 "$root/.github/scripts/verify_candidate_image_sdk.py" "$repository" \ +python3 "$root/tools/verify_candidate_image_sdk.py" "$repository" \ > "$evidence/sdk-verification.log" 2>&1 phase="prepare candidate provenance" phase_log="$evidence/prepare.log" diff --git a/.github/scripts/java17_image.py b/.github/scripts/java17_image.py index c0762de8d..24d432d5a 100644 --- a/.github/scripts/java17_image.py +++ b/.github/scripts/java17_image.py @@ -31,10 +31,11 @@ import time import uuid -from verify_candidate_image_sdk import source_commit, validate_sdk from pathlib import Path ROOT = Path(__file__).resolve().parents[2] +sys.path.insert(0, str(ROOT / "tools")) +from verify_candidate_image_sdk import source_commit, validate_sdk HELPER = ROOT / "hugegraph-hubble/hubble-dist/assembly/travis/run_live_hubble_smoke.py" SPEC = importlib.util.spec_from_file_location("hubble_smoke", HELPER) HTTP = importlib.util.module_from_spec(SPEC) diff --git a/.github/scripts/test_candidate_sdk.py b/.github/scripts/test_candidate_sdk.py index 6ce5024d2..a6df40747 100644 --- a/.github/scripts/test_candidate_sdk.py +++ b/.github/scripts/test_candidate_sdk.py @@ -25,12 +25,14 @@ from pathlib import Path import shutil import subprocess +import sys import tempfile import textwrap import unittest import uuid import xml.etree.ElementTree as ET +sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "tools")) import verify_candidate_image_sdk as sdk @@ -605,7 +607,7 @@ def test_source_build_defaults_agree_without_changing_historical_runtime_fixture upstream = (root / ".github/workflows/upstream-compatibility.yml").read_text() self.assertIn("ref: master", upstream) self.assertNotIn("validation-mode: release", upstream) - release = (root / ".github/actions/setup-hugegraph-server/release.py").read_text() + release = (root / "hugegraph-client/assembly/travis/release.py").read_text() self.assertIn('VERSION = "1.7.0"', release) self.assertIn('apache-hugegraph-incubating-1.7.0.tar.gz', release) @@ -630,7 +632,7 @@ def run_action(self, root, revision, corrupt=None): 'cp -R "$SDK_FIXTURE/." "$3/"\n' 'mkdir -p "$2/hugegraph-server"\n' 'printf archive > "$2/hugegraph-server/apache-hugegraph-fixture.tar.gz"\n') - verifier = workspace / ".github/scripts/verify_candidate_image_sdk.py" + verifier = workspace / "tools/verify_candidate_image_sdk.py" verifier.parent.mkdir(parents=True) shutil.copyfile(sdk.__file__, verifier) runner = root / "runner" diff --git a/.github/scripts/test_java17_image.py b/.github/scripts/test_java17_image.py index eb128c4b2..d0e672543 100644 --- a/.github/scripts/test_java17_image.py +++ b/.github/scripts/test_java17_image.py @@ -23,12 +23,14 @@ import json import os import subprocess +import sys import tempfile import unittest from unittest.mock import patch from pathlib import Path import java17_image as images +sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "tools")) import verify_candidate_image_sdk as sdk diff --git a/.github/workflows/java17-images-ci.yml b/.github/workflows/java17-images-ci.yml index 0d9606541..54574cfc7 100644 --- a/.github/workflows/java17-images-ci.yml +++ b/.github/workflows/java17-images-ci.yml @@ -11,6 +11,7 @@ on: - hugegraph-dist/** - .github/actions/** - .github/scripts/** + - tools/verify_candidate_image_sdk.py - .github/workflows/java17-images-ci.yml - pom.xml push: @@ -23,6 +24,7 @@ on: - hugegraph-dist/** - .github/actions/** - .github/scripts/** + - tools/verify_candidate_image_sdk.py - .github/workflows/java17-images-ci.yml - pom.xml diff --git a/.github/workflows/upstream-compatibility.yml b/.github/workflows/upstream-compatibility.yml index 19fdee8a6..bc942d203 100644 --- a/.github/workflows/upstream-compatibility.yml +++ b/.github/workflows/upstream-compatibility.yml @@ -14,7 +14,7 @@ on: - 'hugegraph-client/assembly/travis/install-candidate-sdk.sh' - 'hugegraph-client/assembly/travis/checkout-server.sh' - 'hugegraph-client/assembly/travis/start-hugegraph-servers.sh' - - '.github/scripts/verify_candidate_image_sdk.py' + - 'tools/verify_candidate_image_sdk.py' permissions: contents: read diff --git a/README.md b/README.md index 6e17d5ef7..ba2f3c23d 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,13 @@ Hubble's primary authentication and connection design targets HugeGraph `1.8/mas Hubble brings graph exploration, schema preparation, asynchronous analysis, and distributed cluster operations into one workspace. -![HugeGraph Hubble workbench](./hugegraph-hubble/docs/images/showcase/home-workbench.jpg) +![HugeGraph Hubble workbench](https://raw.githubusercontent.com/apache/hugegraph-toolchain/master/hugegraph-hubble/docs/images/showcase/home-workbench.jpg) ### Distributed Operations The cluster overview keeps service topology, node health, source status, and capacity facts in one operational view. -![HugeGraph Hubble cluster overview](./hugegraph-hubble/docs/images/showcase/operations-overview.jpg) +![HugeGraph Hubble cluster overview](https://raw.githubusercontent.com/apache/hugegraph-toolchain/master/hugegraph-hubble/docs/images/showcase/operations-overview.jpg) **Quick Navigation**: [Architecture](#architecture-overview) | [Quick Start](#quick-start) | [Modules](#module-overview) | [Build](#build--development) | [Docker](#docker) | [Related Projects](#related-projects) diff --git a/docs/java17-migration.md b/docs/java17-migration.md index 23eea6f95..2feb1b641 100644 --- a/docs/java17-migration.md +++ b/docs/java17-migration.md @@ -27,7 +27,7 @@ mkdir "$candidate_dir/m2" export SERVER_REPOSITORY=apache/hugegraph server_commit=$(python3 - <<'PY_COMMIT' import runpy -print(runpy.run_path(".github/scripts/verify_candidate_image_sdk.py")["COMMIT"]) +print(runpy.run_path("tools/verify_candidate_image_sdk.py")["COMMIT"]) PY_COMMIT ) diff --git a/.github/actions/setup-hugegraph-server/fixture.sh b/hugegraph-client/assembly/travis/fixture.sh similarity index 97% rename from .github/actions/setup-hugegraph-server/fixture.sh rename to hugegraph-client/assembly/travis/fixture.sh index 375045811..4de32a062 100644 --- a/.github/actions/setup-hugegraph-server/fixture.sh +++ b/hugegraph-client/assembly/travis/fixture.sh @@ -69,7 +69,7 @@ fixture_build() { # Reuse the verified SDK build's same-source distribution and isolated repository. candidate_repo=$(mktemp -d "${TMPDIR:-/tmp}/hg-fixture-sdk-m2.XXXXXX") SERVER_REPOSITORY=$FIXTURE_REPOSITORY SERVER_FETCH_REF=$FIXTURE_REF \ - bash "${FIXTURE_HELPER%/*}/../../../hugegraph-client/assembly/travis/install-candidate-sdk.sh" \ + bash "${FIXTURE_HELPER%/*}/install-candidate-sdk.sh" \ "$FIXTURE_COMMIT" "$source_dir" "$candidate_repo" archive=$(find "$source_dir/hugegraph-server" -maxdepth 1 -name 'apache-hugegraph-*.tar.gz' -print) [[ -n "$archive" && -f "$archive" ]] diff --git a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh index 4f7b058da..a7ac1d4e9 100755 --- a/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh +++ b/hugegraph-client/assembly/travis/install-hugegraph-from-source.sh @@ -25,8 +25,8 @@ fi if [[ "${FIXTURE_MODE:-standalone}" == start ]]; then FIXTURE_COMMIT=$1 ROOT_DIR=$(cd "$(dirname "$0")/../../.." && pwd) - source "$ROOT_DIR/.github/actions/setup-hugegraph-server/fixture.sh" - ARCHIVE=$(python3 "$ROOT_DIR/.github/actions/setup-hugegraph-server/manifest.py" name) + source "$ROOT_DIR/hugegraph-client/assembly/travis/fixture.sh" + ARCHIVE=$(python3 "$ROOT_DIR/hugegraph-client/assembly/travis/manifest.py" name) exec bash "$ROOT_DIR/hugegraph-client/assembly/travis/start-hugegraph-servers.sh" "$ARCHIVE" fi SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd) diff --git a/.github/actions/setup-hugegraph-server/manifest.py b/hugegraph-client/assembly/travis/manifest.py similarity index 95% rename from .github/actions/setup-hugegraph-server/manifest.py rename to hugegraph-client/assembly/travis/manifest.py index 0b13a7514..30488ddca 100644 --- a/.github/actions/setup-hugegraph-server/manifest.py +++ b/hugegraph-client/assembly/travis/manifest.py @@ -29,9 +29,9 @@ repo = pathlib.Path(__file__).resolve().parents[3] patterns = ( '.github/actions/setup-hugegraph-server/action.yml', - '.github/actions/setup-hugegraph-server/fixture.sh', - '.github/actions/setup-hugegraph-server/manifest.py', - '.github/actions/setup-hugegraph-server/release.py', + 'hugegraph-client/assembly/travis/fixture.sh', + 'hugegraph-client/assembly/travis/manifest.py', + 'hugegraph-client/assembly/travis/release.py', '.github/actions/setup-java-env/action.yml', '.github/configs/settings.xml', 'hugegraph-client/assembly/travis/checkout-server.sh', 'hugegraph-client/assembly/travis/install-candidate-sdk.sh', diff --git a/.github/actions/setup-hugegraph-server/release.py b/hugegraph-client/assembly/travis/release.py similarity index 100% rename from .github/actions/setup-hugegraph-server/release.py rename to hugegraph-client/assembly/travis/release.py diff --git a/.github/actions/setup-hugegraph-server/service-wait.sh b/hugegraph-client/assembly/travis/service-wait.sh similarity index 100% rename from .github/actions/setup-hugegraph-server/service-wait.sh rename to hugegraph-client/assembly/travis/service-wait.sh diff --git a/hugegraph-client/assembly/travis/start-hugegraph-servers.sh b/hugegraph-client/assembly/travis/start-hugegraph-servers.sh index 27e392283..d63010946 100644 --- a/hugegraph-client/assembly/travis/start-hugegraph-servers.sh +++ b/hugegraph-client/assembly/travis/start-hugegraph-servers.sh @@ -16,7 +16,7 @@ # under the License. # set -euo pipefail -source "$(cd "$(dirname "$0")/../../.." && pwd)/.github/actions/setup-hugegraph-server/service-wait.sh" +source "$(cd "$(dirname "$0")/../../.." && pwd)/hugegraph-client/assembly/travis/service-wait.sh" if [[ $# -ne 1 || ! -f "$1" ]]; then echo "Usage: start-hugegraph-servers.sh " >&2 diff --git a/hugegraph-dist/pom.xml b/hugegraph-dist/pom.xml index acb784ae8..6b221ef53 100644 --- a/hugegraph-dist/pom.xml +++ b/hugegraph-dist/pom.xml @@ -74,7 +74,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -98,7 +98,7 @@ - + diff --git a/hugegraph-hubble/Dockerfile b/hugegraph-hubble/Dockerfile index 2184b7825..bbb530da0 100644 --- a/hugegraph-hubble/Dockerfile +++ b/hugegraph-hubble/Dockerfile @@ -33,7 +33,7 @@ RUN set -x \ COPY hugegraph-client/assembly/travis/install-candidate-sdk.sh \ hugegraph-client/assembly/travis/checkout-server.sh /pkg/hugegraph-client/assembly/travis/ -COPY .github/scripts/verify_candidate_image_sdk.py /pkg/.github/scripts/ +COPY tools/verify_candidate_image_sdk.py /pkg/tools/ # Direct builds bootstrap the same locked SDK; CI can supply a verified builder. RUN mkdir -p /opt/candidate-m2 \ @@ -42,7 +42,7 @@ RUN mkdir -p /opt/candidate-m2 \ bash /pkg/hugegraph-client/assembly/travis/install-candidate-sdk.sh \ 68855199031d5801edb4fe41b2bacbacffe8fe68 /opt/candidate-source /opt/candidate-m2; \ fi \ - && python3 /pkg/.github/scripts/verify_candidate_image_sdk.py /opt/candidate-m2 + && python3 /pkg/tools/verify_candidate_image_sdk.py /opt/candidate-m2 COPY . /pkg @@ -54,7 +54,7 @@ RUN set -x \ && mvn package $MAVEN_ARGS -Dmaven.repo.local=/opt/candidate-m2 \ -Dhugegraph.version=1.8.0 -Dsdk.validation.mode=candidate \ -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true \ - && python3 /pkg/.github/scripts/verify_candidate_image_sdk.py /opt/candidate-m2 \ + && python3 /pkg/tools/verify_candidate_image_sdk.py /opt/candidate-m2 \ && set -- /pkg/hugegraph-hubble/target/apache-hugegraph-hubble-*.tar.gz \ && test "$#" -eq 1 \ && mkdir /hubble-release \ diff --git a/hugegraph-hubble/README.md b/hugegraph-hubble/README.md index 9338594eb..709ef0cef 100644 --- a/hugegraph-hubble/README.md +++ b/hugegraph-hubble/README.md @@ -13,25 +13,25 @@ graph data load, schema management, graph relationship analysis, and graphical d Start from one workspace for graph discovery, import, query, account management, and cluster operations. -![Hubble graph data workbench](docs/images/showcase/home-workbench.jpg) +![Hubble graph data workbench](https://raw.githubusercontent.com/apache/hugegraph-toolchain/master/hugegraph-hubble/docs/images/showcase/home-workbench.jpg) ### GQL Traversal Run Gremlin queries and inspect their graph, table, or JSON results without leaving the workbench. -![Hubble GQL traversal and graph visualization](docs/images/showcase/gql-traversal.jpg) +![Hubble GQL traversal and graph visualization](https://raw.githubusercontent.com/apache/hugegraph-toolchain/master/hugegraph-hubble/docs/images/showcase/gql-traversal.jpg) ### Schema Templates Prepare reusable schemas before configuring data sources and import tasks. -![Hubble schema template management](docs/images/showcase/schema-templates.jpg) +![Hubble schema template management](https://raw.githubusercontent.com/apache/hugegraph-toolchain/master/hugegraph-hubble/docs/images/showcase/schema-templates.jpg) ### Asynchronous Tasks Track asynchronous queries and algorithms, then expand compact results inline. -![Hubble asynchronous task results](docs/images/showcase/async-tasks.jpg) +![Hubble asynchronous task results](https://raw.githubusercontent.com/apache/hugegraph-toolchain/master/hugegraph-hubble/docs/images/showcase/async-tasks.jpg) ## Authentication, connections, and compatibility diff --git a/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh b/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh index 32a5b9970..e91280ab1 100755 --- a/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh +++ b/hugegraph-hubble/hubble-dist/assembly/travis/download-hugegraph.sh @@ -58,4 +58,4 @@ FIXTURE_JAVA=${FIXTURE_JAVA:-17} if [[ -n "${SERVER_MAVEN_REPO:-}" ]]; then export MAVEN_ARGS="${MAVEN_ARGS:-} -Dmaven.repo.local=$SERVER_MAVEN_REPO" fi -source "$REPO_ROOT/.github/actions/setup-hugegraph-server/fixture.sh" +source "$REPO_ROOT/hugegraph-client/assembly/travis/fixture.sh" diff --git a/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server1/install-hugegraph.sh b/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server1/install-hugegraph.sh index 06c7a4c36..edf9da79a 100755 --- a/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server1/install-hugegraph.sh +++ b/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server1/install-hugegraph.sh @@ -18,7 +18,7 @@ set -euo pipefail SERVER_CONFIG_DIR=$(cd "$(dirname "$0")" && pwd) -source "$(cd "$SERVER_CONFIG_DIR/../../../../.." && pwd)/.github/actions/setup-hugegraph-server/service-wait.sh" +source "$(cd "$SERVER_CONFIG_DIR/../../../../.." && pwd)/hugegraph-client/assembly/travis/service-wait.sh" SERVER_PARENT_DIR="hugegraph-server1" mkdir "${SERVER_PARENT_DIR}" diff --git a/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server2/install-hugegraph.sh b/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server2/install-hugegraph.sh index f07adf740..f1d38bed6 100755 --- a/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server2/install-hugegraph.sh +++ b/hugegraph-hubble/hubble-dist/assembly/travis/hugegraph-server2/install-hugegraph.sh @@ -18,7 +18,7 @@ set -euo pipefail SERVER_CONFIG_DIR=$(cd "$(dirname "$0")" && pwd) -source "$(cd "$SERVER_CONFIG_DIR/../../../../.." && pwd)/.github/actions/setup-hugegraph-server/service-wait.sh" +source "$(cd "$SERVER_CONFIG_DIR/../../../../.." && pwd)/hugegraph-client/assembly/travis/service-wait.sh" SERVER_PARENT_DIR="hugegraph-server2" mkdir "${SERVER_PARENT_DIR}" diff --git a/hugegraph-hubble/hubble-dist/pom.xml b/hugegraph-hubble/hubble-dist/pom.xml index 1902d606b..2466aa241 100644 --- a/hugegraph-hubble/hubble-dist/pom.xml +++ b/hugegraph-hubble/hubble-dist/pom.xml @@ -160,7 +160,7 @@ rm -f ${top.level.dir}/dist.sh - + diff --git a/hugegraph-loader/Dockerfile b/hugegraph-loader/Dockerfile index 04a2462a8..c116de399 100644 --- a/hugegraph-loader/Dockerfile +++ b/hugegraph-loader/Dockerfile @@ -29,7 +29,7 @@ RUN apt-get -q update \ COPY hugegraph-client/assembly/travis/install-candidate-sdk.sh \ hugegraph-client/assembly/travis/checkout-server.sh /pkg/hugegraph-client/assembly/travis/ -COPY .github/scripts/verify_candidate_image_sdk.py /pkg/.github/scripts/ +COPY tools/verify_candidate_image_sdk.py /pkg/tools/ # Direct builds bootstrap the same locked SDK; CI can supply a verified builder. RUN mkdir -p /opt/candidate-m2 \ @@ -38,7 +38,7 @@ RUN mkdir -p /opt/candidate-m2 \ bash /pkg/hugegraph-client/assembly/travis/install-candidate-sdk.sh \ 68855199031d5801edb4fe41b2bacbacffe8fe68 /opt/candidate-source /opt/candidate-m2; \ fi \ - && python3 /pkg/.github/scripts/verify_candidate_image_sdk.py /opt/candidate-m2 + && python3 /pkg/tools/verify_candidate_image_sdk.py /opt/candidate-m2 COPY . /pkg @@ -47,7 +47,7 @@ RUN set -x \ -Dhugegraph.version=1.8.0 -Dsdk.validation.mode=candidate \ -pl hugegraph-client,hugegraph-loader -am \ -Dmaven.javadoc.skip=true -DskipTests -ntp \ - && python3 /pkg/.github/scripts/verify_candidate_image_sdk.py /opt/candidate-m2 + && python3 /pkg/tools/verify_candidate_image_sdk.py /opt/candidate-m2 FROM eclipse-temurin:17-jre-jammy diff --git a/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh b/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh index bc8f6bad2..aa3f9ff63 100755 --- a/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh +++ b/hugegraph-loader/assembly/travis/install-hugegraph-from-source.sh @@ -24,8 +24,8 @@ fi if [[ "${FIXTURE_MODE:-standalone}" == start ]]; then FIXTURE_COMMIT=$1 ROOT_DIR=$(cd "$(dirname "$0")/../../.." && pwd) - source "$ROOT_DIR/.github/actions/setup-hugegraph-server/fixture.sh" - ARCHIVE=$(python3 "$ROOT_DIR/.github/actions/setup-hugegraph-server/manifest.py" name) + source "$ROOT_DIR/hugegraph-client/assembly/travis/fixture.sh" + ARCHIVE=$(python3 "$ROOT_DIR/hugegraph-client/assembly/travis/manifest.py" name) exec bash "$ROOT_DIR/hugegraph-client/assembly/travis/start-hugegraph-servers.sh" "$ARCHIVE" fi COMMIT_ID=$1 diff --git a/hugegraph-loader/pom.xml b/hugegraph-loader/pom.xml index 23c9408e6..2aa823679 100644 --- a/hugegraph-loader/pom.xml +++ b/hugegraph-loader/pom.xml @@ -769,7 +769,7 @@ - + diff --git a/hugegraph-tools/pom.xml b/hugegraph-tools/pom.xml index 101e1c22e..1bbfbbe4d 100644 --- a/hugegraph-tools/pom.xml +++ b/hugegraph-tools/pom.xml @@ -211,7 +211,7 @@ - + diff --git a/.github/scripts/verify_candidate_image_sdk.py b/tools/verify_candidate_image_sdk.py similarity index 100% rename from .github/scripts/verify_candidate_image_sdk.py rename to tools/verify_candidate_image_sdk.py From 3cde1ee1ea728bec4e816d79eebb8e9299b0f882 Mon Sep 17 00:00:00 2001 From: imbajin Date: Tue, 13 Oct 2026 11:35:43 +0800 Subject: [PATCH 3/3] refactor: group verifier with module helpers --- .github/actions/setup-candidate-sdk/action.yml | 2 +- .github/scripts/build-java17-image.sh | 2 +- .github/scripts/java17_image.py | 2 +- .github/scripts/test_candidate_sdk.py | 6 +++--- .github/scripts/test_java17_image.py | 2 +- .github/workflows/java17-images-ci.yml | 2 -- .github/workflows/upstream-compatibility.yml | 2 +- README.md | 4 ++-- docs/java17-migration.md | 2 +- .../assembly/travis}/verify_candidate_image_sdk.py | 0 hugegraph-dist/pom.xml | 6 +++--- hugegraph-hubble/Dockerfile | 6 +++--- hugegraph-hubble/README.md | 8 ++++---- hugegraph-hubble/hubble-dist/pom.xml | 2 +- hugegraph-loader/Dockerfile | 6 +++--- hugegraph-loader/pom.xml | 2 +- hugegraph-tools/pom.xml | 2 +- 17 files changed, 27 insertions(+), 29 deletions(-) rename {tools => hugegraph-client/assembly/travis}/verify_candidate_image_sdk.py (100%) diff --git a/.github/actions/setup-candidate-sdk/action.yml b/.github/actions/setup-candidate-sdk/action.yml index 82de151e2..4fabeb259 100644 --- a/.github/actions/setup-candidate-sdk/action.yml +++ b/.github/actions/setup-candidate-sdk/action.yml @@ -78,7 +78,7 @@ runs: exit 1 fi CANDIDATE_SOURCE_COMMIT="$SERVER_COMMIT" \ - python3 "$GITHUB_WORKSPACE/tools/verify_candidate_image_sdk.py" "$candidate_repo" \ + python3 "$GITHUB_WORKSPACE/hugegraph-client/assembly/travis/verify_candidate_image_sdk.py" "$candidate_repo" \ --configure-upstream-env "$GITHUB_ENV" manifest_artifact_id=$(python3 -c 'import uuid; print(uuid.uuid4().hex)') archive_sha=$(sha256sum "${archives[0]}" | cut -d ' ' -f 1) diff --git a/.github/scripts/build-java17-image.sh b/.github/scripts/build-java17-image.sh index ec5710e1a..8c8fbf850 100644 --- a/.github/scripts/build-java17-image.sh +++ b/.github/scripts/build-java17-image.sh @@ -41,7 +41,7 @@ trap report_failure ERR mkdir -p "$work/builder/repository/org/apache" phase="verify candidate SDK" phase_log="$evidence/sdk-verification.log" -python3 "$root/tools/verify_candidate_image_sdk.py" "$repository" \ +python3 "$root/hugegraph-client/assembly/travis/verify_candidate_image_sdk.py" "$repository" \ > "$evidence/sdk-verification.log" 2>&1 phase="prepare candidate provenance" phase_log="$evidence/prepare.log" diff --git a/.github/scripts/java17_image.py b/.github/scripts/java17_image.py index 24d432d5a..92da4bd11 100644 --- a/.github/scripts/java17_image.py +++ b/.github/scripts/java17_image.py @@ -34,7 +34,7 @@ from pathlib import Path ROOT = Path(__file__).resolve().parents[2] -sys.path.insert(0, str(ROOT / "tools")) +sys.path.insert(0, str(ROOT / "hugegraph-client/assembly/travis")) from verify_candidate_image_sdk import source_commit, validate_sdk HELPER = ROOT / "hugegraph-hubble/hubble-dist/assembly/travis/run_live_hubble_smoke.py" SPEC = importlib.util.spec_from_file_location("hubble_smoke", HELPER) diff --git a/.github/scripts/test_candidate_sdk.py b/.github/scripts/test_candidate_sdk.py index a6df40747..4f765d153 100644 --- a/.github/scripts/test_candidate_sdk.py +++ b/.github/scripts/test_candidate_sdk.py @@ -32,7 +32,7 @@ import uuid import xml.etree.ElementTree as ET -sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "tools")) +sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "hugegraph-client/assembly/travis")) import verify_candidate_image_sdk as sdk @@ -632,8 +632,8 @@ def run_action(self, root, revision, corrupt=None): 'cp -R "$SDK_FIXTURE/." "$3/"\n' 'mkdir -p "$2/hugegraph-server"\n' 'printf archive > "$2/hugegraph-server/apache-hugegraph-fixture.tar.gz"\n') - verifier = workspace / "tools/verify_candidate_image_sdk.py" - verifier.parent.mkdir(parents=True) + verifier = workspace / "hugegraph-client/assembly/travis/verify_candidate_image_sdk.py" + verifier.parent.mkdir(parents=True, exist_ok=True) shutil.copyfile(sdk.__file__, verifier) runner = root / "runner" runner.mkdir() diff --git a/.github/scripts/test_java17_image.py b/.github/scripts/test_java17_image.py index d0e672543..708506de6 100644 --- a/.github/scripts/test_java17_image.py +++ b/.github/scripts/test_java17_image.py @@ -30,7 +30,7 @@ from pathlib import Path import java17_image as images -sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "tools")) +sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "hugegraph-client/assembly/travis")) import verify_candidate_image_sdk as sdk diff --git a/.github/workflows/java17-images-ci.yml b/.github/workflows/java17-images-ci.yml index 54574cfc7..0d9606541 100644 --- a/.github/workflows/java17-images-ci.yml +++ b/.github/workflows/java17-images-ci.yml @@ -11,7 +11,6 @@ on: - hugegraph-dist/** - .github/actions/** - .github/scripts/** - - tools/verify_candidate_image_sdk.py - .github/workflows/java17-images-ci.yml - pom.xml push: @@ -24,7 +23,6 @@ on: - hugegraph-dist/** - .github/actions/** - .github/scripts/** - - tools/verify_candidate_image_sdk.py - .github/workflows/java17-images-ci.yml - pom.xml diff --git a/.github/workflows/upstream-compatibility.yml b/.github/workflows/upstream-compatibility.yml index bc942d203..3a711a486 100644 --- a/.github/workflows/upstream-compatibility.yml +++ b/.github/workflows/upstream-compatibility.yml @@ -14,7 +14,7 @@ on: - 'hugegraph-client/assembly/travis/install-candidate-sdk.sh' - 'hugegraph-client/assembly/travis/checkout-server.sh' - 'hugegraph-client/assembly/travis/start-hugegraph-servers.sh' - - 'tools/verify_candidate_image_sdk.py' + - 'hugegraph-client/assembly/travis/verify_candidate_image_sdk.py' permissions: contents: read diff --git a/README.md b/README.md index ba2f3c23d..6e17d5ef7 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,13 @@ Hubble's primary authentication and connection design targets HugeGraph `1.8/mas Hubble brings graph exploration, schema preparation, asynchronous analysis, and distributed cluster operations into one workspace. -![HugeGraph Hubble workbench](https://raw.githubusercontent.com/apache/hugegraph-toolchain/master/hugegraph-hubble/docs/images/showcase/home-workbench.jpg) +![HugeGraph Hubble workbench](./hugegraph-hubble/docs/images/showcase/home-workbench.jpg) ### Distributed Operations The cluster overview keeps service topology, node health, source status, and capacity facts in one operational view. -![HugeGraph Hubble cluster overview](https://raw.githubusercontent.com/apache/hugegraph-toolchain/master/hugegraph-hubble/docs/images/showcase/operations-overview.jpg) +![HugeGraph Hubble cluster overview](./hugegraph-hubble/docs/images/showcase/operations-overview.jpg) **Quick Navigation**: [Architecture](#architecture-overview) | [Quick Start](#quick-start) | [Modules](#module-overview) | [Build](#build--development) | [Docker](#docker) | [Related Projects](#related-projects) diff --git a/docs/java17-migration.md b/docs/java17-migration.md index 2feb1b641..caa8263fa 100644 --- a/docs/java17-migration.md +++ b/docs/java17-migration.md @@ -27,7 +27,7 @@ mkdir "$candidate_dir/m2" export SERVER_REPOSITORY=apache/hugegraph server_commit=$(python3 - <<'PY_COMMIT' import runpy -print(runpy.run_path("tools/verify_candidate_image_sdk.py")["COMMIT"]) +print(runpy.run_path("hugegraph-client/assembly/travis/verify_candidate_image_sdk.py")["COMMIT"]) PY_COMMIT ) diff --git a/tools/verify_candidate_image_sdk.py b/hugegraph-client/assembly/travis/verify_candidate_image_sdk.py similarity index 100% rename from tools/verify_candidate_image_sdk.py rename to hugegraph-client/assembly/travis/verify_candidate_image_sdk.py diff --git a/hugegraph-dist/pom.xml b/hugegraph-dist/pom.xml index 6b221ef53..e732c5740 100644 --- a/hugegraph-dist/pom.xml +++ b/hugegraph-dist/pom.xml @@ -74,7 +74,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -98,7 +98,7 @@ - + diff --git a/hugegraph-hubble/Dockerfile b/hugegraph-hubble/Dockerfile index bbb530da0..1ec24c653 100644 --- a/hugegraph-hubble/Dockerfile +++ b/hugegraph-hubble/Dockerfile @@ -33,7 +33,7 @@ RUN set -x \ COPY hugegraph-client/assembly/travis/install-candidate-sdk.sh \ hugegraph-client/assembly/travis/checkout-server.sh /pkg/hugegraph-client/assembly/travis/ -COPY tools/verify_candidate_image_sdk.py /pkg/tools/ +COPY hugegraph-client/assembly/travis/verify_candidate_image_sdk.py /pkg/hugegraph-client/assembly/travis/ # Direct builds bootstrap the same locked SDK; CI can supply a verified builder. RUN mkdir -p /opt/candidate-m2 \ @@ -42,7 +42,7 @@ RUN mkdir -p /opt/candidate-m2 \ bash /pkg/hugegraph-client/assembly/travis/install-candidate-sdk.sh \ 68855199031d5801edb4fe41b2bacbacffe8fe68 /opt/candidate-source /opt/candidate-m2; \ fi \ - && python3 /pkg/tools/verify_candidate_image_sdk.py /opt/candidate-m2 + && python3 /pkg/hugegraph-client/assembly/travis/verify_candidate_image_sdk.py /opt/candidate-m2 COPY . /pkg @@ -54,7 +54,7 @@ RUN set -x \ && mvn package $MAVEN_ARGS -Dmaven.repo.local=/opt/candidate-m2 \ -Dhugegraph.version=1.8.0 -Dsdk.validation.mode=candidate \ -e -B -ntp -DskipTests -Dmaven.javadoc.skip=true \ - && python3 /pkg/tools/verify_candidate_image_sdk.py /opt/candidate-m2 \ + && python3 /pkg/hugegraph-client/assembly/travis/verify_candidate_image_sdk.py /opt/candidate-m2 \ && set -- /pkg/hugegraph-hubble/target/apache-hugegraph-hubble-*.tar.gz \ && test "$#" -eq 1 \ && mkdir /hubble-release \ diff --git a/hugegraph-hubble/README.md b/hugegraph-hubble/README.md index 709ef0cef..9338594eb 100644 --- a/hugegraph-hubble/README.md +++ b/hugegraph-hubble/README.md @@ -13,25 +13,25 @@ graph data load, schema management, graph relationship analysis, and graphical d Start from one workspace for graph discovery, import, query, account management, and cluster operations. -![Hubble graph data workbench](https://raw.githubusercontent.com/apache/hugegraph-toolchain/master/hugegraph-hubble/docs/images/showcase/home-workbench.jpg) +![Hubble graph data workbench](docs/images/showcase/home-workbench.jpg) ### GQL Traversal Run Gremlin queries and inspect their graph, table, or JSON results without leaving the workbench. -![Hubble GQL traversal and graph visualization](https://raw.githubusercontent.com/apache/hugegraph-toolchain/master/hugegraph-hubble/docs/images/showcase/gql-traversal.jpg) +![Hubble GQL traversal and graph visualization](docs/images/showcase/gql-traversal.jpg) ### Schema Templates Prepare reusable schemas before configuring data sources and import tasks. -![Hubble schema template management](https://raw.githubusercontent.com/apache/hugegraph-toolchain/master/hugegraph-hubble/docs/images/showcase/schema-templates.jpg) +![Hubble schema template management](docs/images/showcase/schema-templates.jpg) ### Asynchronous Tasks Track asynchronous queries and algorithms, then expand compact results inline. -![Hubble asynchronous task results](https://raw.githubusercontent.com/apache/hugegraph-toolchain/master/hugegraph-hubble/docs/images/showcase/async-tasks.jpg) +![Hubble asynchronous task results](docs/images/showcase/async-tasks.jpg) ## Authentication, connections, and compatibility diff --git a/hugegraph-hubble/hubble-dist/pom.xml b/hugegraph-hubble/hubble-dist/pom.xml index 2466aa241..210d2fc2a 100644 --- a/hugegraph-hubble/hubble-dist/pom.xml +++ b/hugegraph-hubble/hubble-dist/pom.xml @@ -160,7 +160,7 @@ rm -f ${top.level.dir}/dist.sh - + diff --git a/hugegraph-loader/Dockerfile b/hugegraph-loader/Dockerfile index c116de399..d1168a5c5 100644 --- a/hugegraph-loader/Dockerfile +++ b/hugegraph-loader/Dockerfile @@ -29,7 +29,7 @@ RUN apt-get -q update \ COPY hugegraph-client/assembly/travis/install-candidate-sdk.sh \ hugegraph-client/assembly/travis/checkout-server.sh /pkg/hugegraph-client/assembly/travis/ -COPY tools/verify_candidate_image_sdk.py /pkg/tools/ +COPY hugegraph-client/assembly/travis/verify_candidate_image_sdk.py /pkg/hugegraph-client/assembly/travis/ # Direct builds bootstrap the same locked SDK; CI can supply a verified builder. RUN mkdir -p /opt/candidate-m2 \ @@ -38,7 +38,7 @@ RUN mkdir -p /opt/candidate-m2 \ bash /pkg/hugegraph-client/assembly/travis/install-candidate-sdk.sh \ 68855199031d5801edb4fe41b2bacbacffe8fe68 /opt/candidate-source /opt/candidate-m2; \ fi \ - && python3 /pkg/tools/verify_candidate_image_sdk.py /opt/candidate-m2 + && python3 /pkg/hugegraph-client/assembly/travis/verify_candidate_image_sdk.py /opt/candidate-m2 COPY . /pkg @@ -47,7 +47,7 @@ RUN set -x \ -Dhugegraph.version=1.8.0 -Dsdk.validation.mode=candidate \ -pl hugegraph-client,hugegraph-loader -am \ -Dmaven.javadoc.skip=true -DskipTests -ntp \ - && python3 /pkg/tools/verify_candidate_image_sdk.py /opt/candidate-m2 + && python3 /pkg/hugegraph-client/assembly/travis/verify_candidate_image_sdk.py /opt/candidate-m2 FROM eclipse-temurin:17-jre-jammy diff --git a/hugegraph-loader/pom.xml b/hugegraph-loader/pom.xml index 2aa823679..466dc38a3 100644 --- a/hugegraph-loader/pom.xml +++ b/hugegraph-loader/pom.xml @@ -769,7 +769,7 @@ - + diff --git a/hugegraph-tools/pom.xml b/hugegraph-tools/pom.xml index 1bbfbbe4d..0e3537ad2 100644 --- a/hugegraph-tools/pom.xml +++ b/hugegraph-tools/pom.xml @@ -211,7 +211,7 @@ - +