Skip to content

fix(ci): base compose stack on hstore topology #30

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

Merged
imbajin merged 2 commits into from
Sep 3, 2026
Merged

fix(ci): base compose stack on hstore topology #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aefd77
fix(ci): base compose stack on hstore topology
bitflicker64 Sep 3, 2026
2f46a7b
fix(ci): clarify compose file error
imbajin Sep 3, 2026
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
41 changes: 34 additions & 7 deletions .github/workflows/_publish_pd_store_server_reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,17 +610,29 @@ jobs:
echo "HUGEGRAPH_ADMIN_PASSWORD=$HUGEGRAPH_ADMIN_PASSWORD" >> "$GITHUB_ENV"
export HUGEGRAPH_ADMIN_PASSWORD

if [ -f "docker/docker-compose.dev.yml" ]; then
if [ -f "docker/docker-compose-hstore.yml" ] \
&& [ -f "docker/docker-compose.dev.yml" ]; then
# The current HugeGraph dev file is a thin HStore override. Keep the
# base topology in the command so its networks and named volumes are
# defined before the override is applied.
compose_file="docker/docker-compose-hstore.yml"
compose_dev_file="docker/docker-compose.dev.yml"
elif [ -f "docker/docker-compose.dev.yml" ]; then
# Older source revisions may still ship a self-contained dev file.
compose_file="docker/docker-compose.dev.yml"
compose_dev_file=""
elif [ -f "docker/docker-compose.yml" ]; then
compose_file="docker/docker-compose.yml"
compose_dev_file=""
echo "WARN: docker/docker-compose.dev.yml is unavailable; using legacy docker/docker-compose.yml"
else
echo "ERROR: no supported compose file found in $SOURCE_REPOSITORY@$SOURCE_SHA"
echo "Expected docker/docker-compose.dev.yml or docker/docker-compose.yml."
echo "Expected docker/docker-compose-hstore.yml plus docker/docker-compose.dev.yml,"
echo "or a self-contained docker/docker-compose.dev.yml or docker/docker-compose.yml."
exit 1
Comment thread
imbajin marked this conversation as resolved.
fi
echo "COMPOSE_FILE=$compose_file" >> "$GITHUB_ENV"
echo "COMPOSE_DEV_FILE=$compose_dev_file" >> "$GITHUB_ENV"

cat > /tmp/hg-ci-patch-server-config.sh <<'PATCH_SERVER'
#!/usr/bin/env bash
Expand Down Expand Up @@ -749,13 +761,18 @@ jobs:
read_only: true
COMPOSE_OVERRIDE

compose_args=(-f "$compose_file")
if [ -n "$compose_dev_file" ]; then
compose_args+=(-f "$compose_dev_file")
fi
docker compose \
-p hg-ci-precheck \
-f "$compose_file" \
"${compose_args[@]}" \
-f /tmp/docker-compose.ci.override.yml \
up -d --wait --wait-timeout "$WAIT_TIMEOUT_SEC"

docker compose -p hg-ci-precheck -f "$compose_file" -f /tmp/docker-compose.ci.override.yml ps
docker compose -p hg-ci-precheck "${compose_args[@]}" \
-f /tmp/docker-compose.ci.override.yml ps

- name: Verify CI resource limits
if: ${{ inputs.strict_mode }}
Expand Down Expand Up @@ -882,8 +899,14 @@ jobs:
if: ${{ failure() && inputs.strict_mode }}
run: |
if [ -n "${COMPOSE_FILE:-}" ] && [ -f /tmp/docker-compose.ci.override.yml ]; then
docker compose -p hg-ci-precheck -f "$COMPOSE_FILE" -f /tmp/docker-compose.ci.override.yml ps || true
docker compose -p hg-ci-precheck -f "$COMPOSE_FILE" -f /tmp/docker-compose.ci.override.yml logs --no-color --tail=200 || true
compose_args=(-f "$COMPOSE_FILE")
if [ -n "${COMPOSE_DEV_FILE:-}" ]; then
compose_args+=(-f "$COMPOSE_DEV_FILE")
fi
docker compose -p hg-ci-precheck "${compose_args[@]}" \
-f /tmp/docker-compose.ci.override.yml ps || true
docker compose -p hg-ci-precheck "${compose_args[@]}" \
-f /tmp/docker-compose.ci.override.yml logs --no-color --tail=200 || true
else
echo "Compose stack was not started; COMPOSE_FILE or CI override is unavailable"
fi
Expand All @@ -904,9 +927,13 @@ jobs:
set -euo pipefail

if [ -n "${COMPOSE_FILE:-}" ] && [ -f /tmp/docker-compose.ci.override.yml ]; then
compose_args=(-f "$COMPOSE_FILE")
if [ -n "${COMPOSE_DEV_FILE:-}" ]; then
compose_args+=(-f "$COMPOSE_DEV_FILE")
fi
docker compose \
-p hg-ci-precheck \
-f "$COMPOSE_FILE" \
"${compose_args[@]}" \
-f /tmp/docker-compose.ci.override.yml \
down -v --remove-orphans
else
Expand Down