From 9919e5b2db011c13c23b2d6f28d698eb11b60d84 Mon Sep 17 00:00:00 2001 From: Toksi Date: Wed, 22 Apr 2026 12:36:57 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20deploy=20wor?= =?UTF-8?q?kflows=20=D0=B8=20compose-=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-ci.yml | 24 ++---------------------- .github/workflows/release-ci.yml | 22 +--------------------- 2 files changed, 3 insertions(+), 43 deletions(-) diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml index f159a7f8..8e841303 100644 --- a/.github/workflows/dev-ci.yml +++ b/.github/workflows/dev-ci.yml @@ -83,28 +83,8 @@ jobs: exit 1 fi && - celery_status="" && - celery_ping="" && - for attempt in $(seq 1 24); do - celery_status="$(docker inspect -f '{{.State.Status}}' api_celery 2>/dev/null || true)" && - if [ "$celery_status" = "running" ]; then - celery_ping="$(docker compose -f docker-compose.dev-ci.yml exec -T celerys sh -lc 'celery -A procollab inspect ping -d \"celery@$(hostname)\"' 2>&1 || true)" && - printf '%s\n' "$celery_ping" && - if printf '%s\n' "$celery_ping" | grep -q 'pong'; then - echo "Celery check passed on attempt ${attempt}" && - break - fi - fi && - - sleep 5 - done && - + celery_status="$(docker inspect -f '{{.State.Status}}' api_celery 2>/dev/null || true)" && if [ "$celery_status" != "running" ]; then echo "Celery container is not running: ${celery_status}" >&2 && exit 1 - fi && - - printf '%s\n' "$celery_ping" | grep -q 'pong' || { - echo "Celery ping failed" >&2 - exit 1 - } + fi diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 5389e3d4..706e1769 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -210,28 +210,8 @@ jobs: exit 1 fi - celery_status="" - celery_ping="" - for attempt in $(seq 1 24); do - celery_status="$(docker inspect -f '{{.State.Status}}' api_celery 2>/dev/null || true)" - if [ "$celery_status" = "running" ]; then - celery_ping="$(docker compose -f docker-compose.prod-ci.yml -p prod exec -T celerys sh -lc 'celery -A procollab inspect ping -d \"celery@$(hostname)\"' 2>&1 || true)" - printf '%s\n' "$celery_ping" - if printf '%s\n' "$celery_ping" | grep -q 'pong'; then - echo "Celery check passed on attempt ${attempt}" - break - fi - fi - - sleep 5 - done - + celery_status="$(docker inspect -f '{{.State.Status}}' api_celery 2>/dev/null || true)" if [ "$celery_status" != "running" ]; then echo "Celery container is not running: ${celery_status}" >&2 exit 1 fi - - printf '%s\n' "$celery_ping" | grep -q 'pong' || { - echo "Celery ping failed" >&2 - exit 1 - }