fix: keep source release helpers outside GitHub

.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

.gitattributes

@@ -8,9 +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.
+/hugegraph-hubble/docs/images/ export-ignore

.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/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)

.github/actions/setup-hugegraph-server/action.yml

@@ -45,15 +45,15 @@ 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:
         FIXTURE_MODE: ${{ inputs.mode }}
         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

.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)

.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/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"

.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 / "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)
 HTTP = importlib.util.module_from_spec(SPEC)

.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] / "hugegraph-client/assembly/travis"))
 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,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 / ".github/scripts/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()

.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] / "hugegraph-client/assembly/travis"))
 import verify_candidate_image_sdk as sdk
 
 

.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'
+      - 'hugegraph-client/assembly/travis/verify_candidate_image_sdk.py'
 
 permissions:
   contents: read

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("hugegraph-client/assembly/travis/verify_candidate_image_sdk.py")["COMMIT"])
 PY_COMMIT
 )
 

.github/actions/setup-hugegraph-server/fixture.sh → 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" ]]

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)

.github/actions/setup-hugegraph-server/manifest.py → 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',

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 <server archive>" >&2

hugegraph-dist/pom.xml

@@ -74,7 +74,7 @@
                                     </fileset>
                                 </copy>
                                 <exec executable="python3" failonerror="true">
-                                    <arg value="${project.basedir}/../.github/scripts/verify_candidate_image_sdk.py"/>
+                                    <arg value="${project.basedir}/../hugegraph-client/assembly/travis/verify_candidate_image_sdk.py"/>
                                     <arg value="${settings.localRepository}"/>
                                     <arg value="--mode"/>
                                     <arg value="${sdk.validation.mode}"/>
@@ -86,7 +86,7 @@
                                     <arg value="loader"/>
                                 </exec>
                                 <exec executable="python3" failonerror="true">
-                                    <arg value="${project.basedir}/../.github/scripts/verify_candidate_image_sdk.py"/>
+                                    <arg value="${project.basedir}/../hugegraph-client/assembly/travis/verify_candidate_image_sdk.py"/>
                                     <arg value="${settings.localRepository}"/>
                                     <arg value="--mode"/>
                                     <arg value="${sdk.validation.mode}"/>
@@ -98,7 +98,7 @@
                                     <arg value="tools"/>
                                 </exec>
                                 <exec executable="python3" failonerror="true">
-                                    <arg value="${project.basedir}/../.github/scripts/verify_candidate_image_sdk.py"/>
+                                    <arg value="${project.basedir}/../hugegraph-client/assembly/travis/verify_candidate_image_sdk.py"/>
                                     <arg value="${settings.localRepository}"/>
                                     <arg value="--mode"/>
                                     <arg value="${sdk.validation.mode}"/>

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 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/.github/scripts/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/.github/scripts/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 \

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"

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}"

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}"

hugegraph-hubble/hubble-dist/pom.xml

@@ -160,7 +160,7 @@
                                     rm -f ${top.level.dir}/dist.sh
                                 </echo>
                                 <exec executable="python3" failonerror="true">
-                                    <arg value="${repo.root.dir}/.github/scripts/verify_candidate_image_sdk.py"/>
+                                    <arg value="${repo.root.dir}/hugegraph-client/assembly/travis/verify_candidate_image_sdk.py"/>
                                     <arg value="${settings.localRepository}"/>
                                     <arg value="--mode"/>
                                     <arg value="${sdk.validation.mode}"/>

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 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/.github/scripts/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/.github/scripts/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