Skip to content

Commit c1a9adc

Browse files
authored
Merge branch 'main' into feat-background-services
Signed-off-by: Adam Poulemanos <89049923+bashandbone@users.noreply.github.com>
2 parents d4b1377 + 21f389e commit c1a9adc

File tree

2 files changed

+31
-11
lines changed

2 files changed

+31
-11
lines changed

.github/workflows/docker.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,26 @@ jobs:
188188
docker compose up -d
189189
# .github/workflows/docker.yml
190190
- name: Wait for services to be healthy
191+
env:
192+
# Health check endpoints - /healthz for Qdrant (v1.5.0+), /health/ for CodeWeaver
193+
QDRANT_HEALTH_URL: http://localhost:6333/healthz
194+
CODEWEAVER_HEALTH_URL: http://localhost:9328/health/
191195
run: |
192196
echo "Waiting for Qdrant to be ready..."
193-
timeout 60 bash -c 'until curl -sf http://localhost:6333/health; do sleep 2; done'
197+
# Use /healthz endpoint (Qdrant v1.5.0+), /health returns 404
198+
max_attempts=30
199+
attempt=0
200+
until curl -sf "$QDRANT_HEALTH_URL" >/dev/null 2>&1; do
201+
attempt=$((attempt + 1))
202+
if [ $attempt -ge $max_attempts ]; then
203+
echo "Qdrant failed to become healthy after $max_attempts attempts"
204+
docker compose logs qdrant
205+
exit 1
206+
fi
207+
echo "Waiting for Qdrant... (attempt $attempt/$max_attempts)"
208+
sleep 2
209+
done
210+
echo "Qdrant is healthy!"
194211
195212
echo "Waiting for CodeWeaver to be ready..."
196213
# Increase timeout to 5 minutes for initial model downloads

REUSE.toml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@
55

66
version = 1
77

8+
# REUSE annotations file for third-party and vendored files.
9+
#
10+
# This file documents copyright and licensing for files where:
11+
# 1. The original source has different licensing than CodeWeaver
12+
# 2. The files are vendored or derived from third-party projects
13+
# 3. Direct header annotation is not practical
14+
#
15+
# See https://reuse.software and https://github.com/fsfe/reuse-tool for more details.
16+
817
# =============================================================================
918
# typings/uuid_extensions - Type stubs generated by pyright from uuid7 package
1019
# =============================================================================
@@ -105,15 +114,9 @@ SPDX-License-Identifier = "MIT"
105114

106115
# PHP: tree-sitter/tree-sitter-php (MIT - Josh Vera, Max Brunsfeld et al 2017-2019)
107116
[[annotations]]
108-
path = [
109-
"data/node_types/php-node-types.json",
110-
"data/node_types/php_sparse-node-types.json"
111-
]
117+
path = ["data/node_types/php-node-types.json", "data/node_types/php_sparse-node-types.json"]
112118
precedence = "override"
113-
SPDX-FileCopyrightText = [
114-
"2017 Josh Vera",
115-
"2019 Max Brunsfeld, Amaan Qureshi, Christian Frøystad, Caleb White"
116-
]
119+
SPDX-FileCopyrightText = ["2017 Josh Vera", "2019 Max Brunsfeld, Amaan Qureshi, Christian Frøystad, Caleb White"]
117120
SPDX-License-Identifier = "MIT"
118121

119122
# Bash: tree-sitter/tree-sitter-bash (MIT - Max Brunsfeld 2017)
@@ -217,8 +220,8 @@ SPDX-License-Identifier = "MIT"
217220
path = "data/node_types/analysis/**"
218221
precedence = "override"
219222
SPDX-FileCopyrightText = [
220-
"2014-2021 Tree-sitter grammar contributors (see individual grammar licenses)",
221-
"2025 Knitli Inc."
223+
"2014-2021 Tree-sitter grammar contributors (see individual grammar licenses)",
224+
"2025 Knitli Inc."
222225
]
223226
SPDX-License-Identifier = "MIT"
224227

0 commit comments

Comments
 (0)