diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 3907b21..4510857 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -13,7 +13,7 @@ env:
BALANCER_SERVICE: "rest_balancer_service"
ADMIN_SERVICE: "rest_admin_service"
MIGRATIONS_SERVICE: "system_service"
- TELEPHONY_SERVICE: "rest_telephony_service" # ๐ ะะพะฑะฐะฒะปะตะฝ ัะตัะฒะธั ัะตะปะตัะพะฝะธะธ
+ TELEPHONY_SERVICE: "rest_telephony_service"
jobs:
deploy:
@@ -21,9 +21,6 @@ jobs:
timeout-minutes: 30
steps:
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- # ะจะะ 1: ะะฝัะพัะผะฐัะธั ะพ ะดะตะฟะปะพะต
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- name: ๐ Deployment Info
run: |
echo "โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ"
@@ -38,9 +35,6 @@ jobs:
echo "User: $(whoami)"
echo "โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ"
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- # ะจะะ 2: Checkout
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- name: ๐ฆ Checkout & Analyze Changes
id: checkout
run: |
@@ -52,7 +46,7 @@ jobs:
DEPLOY_TELEGRAM=false
DEPLOY_BALANCER=false
DEPLOY_ADMIN=false
- DEPLOY_TELEPHONY=false # ๐ ะะฝะธัะธะฐะปะธะทะฐัะธั
+ DEPLOY_TELEPHONY=false
if [ -d "$REPO_DIR/.git" ]; then
echo "๐ฆ Updating existing repo..."
@@ -103,7 +97,6 @@ jobs:
echo "๐ง Admin service changed"
DEPLOY_ADMIN=true
fi
- # ๐ ะัะพะฒะตัะบะฐ ะธะทะผะตะฝะตะฝะธะน ะฒ ัะตัะฒะธัะต ัะตะปะตัะพะฝะธะธ
if echo "$CHANGED_FILES" | grep -q "^service/rest_telephony_service/"; then
echo "๐ Telephony service changed"
DEPLOY_TELEPHONY=true
@@ -129,7 +122,7 @@ jobs:
echo "DEPLOY_TELEGRAM=$DEPLOY_TELEGRAM"
echo "DEPLOY_BALANCER=$DEPLOY_BALANCER"
echo "DEPLOY_ADMIN=$DEPLOY_ADMIN"
- echo "DEPLOY_TELEPHONY=$DEPLOY_TELEPHONY" # ๐ ะัะพะฑัะพั ะฒ ENV
+ echo "DEPLOY_TELEPHONY=$DEPLOY_TELEPHONY"
} >> $GITHUB_ENV
echo ""
@@ -140,26 +133,16 @@ jobs:
echo " ๐ง Admin: $DEPLOY_ADMIN"
echo " ๐ Telephony: $DEPLOY_TELEPHONY"
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- # ะจะะ 3: ะัะพะฒะตัะบะฐ ะฟะปะฐะฝะฐ
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- name: ๐ Check Deployment Plan
id: check_plan
run: |
- if [ "$DEPLOY_MIGRATIONS" = "false" ] && \
- [ "$DEPLOY_TELEGRAM" = "false" ] && \
- [ "$DEPLOY_BALANCER" = "false" ] && \
- [ "$DEPLOY_ADMIN" = "false" ] && \
- [ "$DEPLOY_TELEPHONY" = "false" ]; then # ๐
+ if [ "$DEPLOY_MIGRATIONS" = "false" ] && [ "$DEPLOY_TELEGRAM" = "false" ] && [ "$DEPLOY_BALANCER" = "false" ] && [ "$DEPLOY_ADMIN" = "false" ] && [ "$DEPLOY_TELEPHONY" = "false" ]; then
echo "โญ๏ธ No services need to be deployed โ skipping"
echo "SKIP_DEPLOY=true" >> $GITHUB_ENV
else
echo "SKIP_DEPLOY=false" >> $GITHUB_ENV
fi
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- # ะจะะ 4: Inject config
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- name: ๐ Inject Config
if: env.SKIP_DEPLOY == 'false'
run: |
@@ -171,9 +154,6 @@ jobs:
cp /etc/ruspet/config.yml "$REPO_DIR/core/config/config.yml"
echo "โ
Config injected"
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- # ะจะะ 5: ะกะพะทะดะฐะฝะธะต backup-ะพะฒ
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- name: ๐พ Create Backups
if: env.SKIP_DEPLOY == 'false'
run: |
@@ -195,33 +175,38 @@ jobs:
fi
}
+ if [ "$DEPLOY_MIGRATIONS" = "true" ]; then create_backup "$MIGRATIONS_SERVICE"; fi
if [ "$DEPLOY_TELEGRAM" = "true" ]; then create_backup "$TELEGRAM_SERVICE"; fi
if [ "$DEPLOY_BALANCER" = "true" ]; then create_backup "$BALANCER_SERVICE"; fi
if [ "$DEPLOY_ADMIN" = "true" ]; then create_backup "$ADMIN_SERVICE"; fi
- if [ "$DEPLOY_TELEPHONY" = "true" ]; then create_backup "$TELEPHONY_SERVICE"; fi # ๐
+ if [ "$DEPLOY_TELEPHONY" = "true" ]; then create_backup "$TELEPHONY_SERVICE"; fi
echo "๐งน Cleaning old backups..."
ls -t "$BACKUP_DIR"/* 2>/dev/null | tail -n +11 | xargs -r rm -- || true
echo "โ
Backups ready"
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- # ะจะะ 6: ะะธะณัะฐัะธะธ ะะ
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- - name: ๐๏ธ Run Database Migrations
+ - name: ๐๏ธ Deploy System Service (Migrations & Background Tasks)
if: env.DEPLOY_MIGRATIONS == 'true' && env.SKIP_DEPLOY == 'false'
id: deploy_migrations
run: |
- echo "๐๏ธ Running database migrations..."
+ echo "๐๏ธ Deploying system service..."
if sudo /usr/bin/bash "$REPO_DIR/deploy.sh" migrations; then
- echo "โ
Migrations completed successfully"
+ echo "โ
System service deployed"
echo "MIGRATIONS_DEPLOYED=true" >> $GITHUB_ENV
+ sleep 3
+ if sudo /usr/bin/systemctl is-active --quiet "$MIGRATIONS_SERVICE"; then
+ echo "โ
System service is running"
+ else
+ echo "โ System service failed to start"
+ sudo /usr/bin/journalctl -u "$MIGRATIONS_SERVICE" -n 30 --no-pager
+ exit 1
+ fi
else
- echo "โ Migrations failed"
+ echo "โ System deployment failed"
echo "MIGRATIONS_DEPLOYED=false" >> $GITHUB_ENV
exit 1
fi
- # (ะจะะะ 7, 8, 9 - Telegram, Balancer, Admin ะพััะฐัััั ะฑะตะท ะธะทะผะตะฝะตะฝะธะน)
- name: ๐ค Deploy Telegram Bot
if: env.DEPLOY_TELEGRAM == 'true' && env.SKIP_DEPLOY == 'false'
id: deploy_telegram
@@ -237,7 +222,7 @@ jobs:
fi
- name: โ๏ธ Deploy Balancer Service
- if: env.DEPLOY_BALANCER == 'true' && env.SKIP_DEPLOY == 'false' && false
+ if: env.DEPLOY_BALANCER == 'true' && env.SKIP_DEPLOY == 'false'
id: deploy_balancer
run: |
if sudo /usr/bin/bash "$REPO_DIR/deploy.sh" balancer; then
@@ -264,9 +249,6 @@ jobs:
exit 1
fi
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- # ะจะะ 9.5: ะะตะฟะปะพะน ัะตะปะตัะพะฝะธะธ (ะะะะซะ)
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- name: ๐ Deploy Telephony Service
if: env.DEPLOY_TELEPHONY == 'true' && env.SKIP_DEPLOY == 'false'
id: deploy_telephony
@@ -289,9 +271,6 @@ jobs:
exit 1
fi
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- # ะจะะ 10: Rollback ะฟัะธ ะพัะธะฑะบะต
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- name: โฎ๏ธ Rollback on Failure
if: failure()
run: |
@@ -315,16 +294,14 @@ jobs:
fi
}
+ if [ "$DEPLOY_MIGRATIONS" = "true" ]; then rollback_service "$MIGRATIONS_SERVICE"; fi
if [ "$DEPLOY_TELEGRAM" = "true" ]; then rollback_service "$TELEGRAM_SERVICE"; fi
if [ "$DEPLOY_BALANCER" = "true" ]; then rollback_service "$BALANCER_SERVICE"; fi
if [ "$DEPLOY_ADMIN" = "true" ]; then rollback_service "$ADMIN_SERVICE"; fi
- if [ "$DEPLOY_TELEPHONY" = "true" ]; then rollback_service "$TELEPHONY_SERVICE"; fi # ๐
+ if [ "$DEPLOY_TELEPHONY" = "true" ]; then rollback_service "$TELEPHONY_SERVICE"; fi
echo "โ
Rollback completed"
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- # ะจะะ 11: ะคะธะฝะฐะปัะฝะฐั ะฒะตัะธัะธะบะฐัะธั
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- name: โ
Verify Services
if: env.SKIP_DEPLOY == 'false' && success()
run: |
@@ -344,16 +321,14 @@ jobs:
fi
}
+ verify_service "$MIGRATIONS_SERVICE" "$DEPLOY_MIGRATIONS"
verify_service "$TELEGRAM_SERVICE" "$DEPLOY_TELEGRAM"
verify_service "$BALANCER_SERVICE" "$DEPLOY_BALANCER"
verify_service "$ADMIN_SERVICE" "$DEPLOY_ADMIN"
- verify_service "$TELEPHONY_SERVICE" "$DEPLOY_TELEPHONY" # ๐
+ verify_service "$TELEPHONY_SERVICE" "$DEPLOY_TELEPHONY"
if [ "$ALL_OK" != "true" ]; then exit 1; fi
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- # ะจะะ 12: ะฃะฒะตะดะพะผะปะตะฝะธะต ะพะฑ ััะฟะตั
ะต
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- name: ๐ข Notify Success
if: success()
run: |
@@ -363,24 +338,20 @@ jobs:
MESSAGE+="๐ Commit: ${{ github.sha }}%0A"
MESSAGE+="๐ค Author: ${{ github.actor }}%0A%0A"
- if [ "$DEPLOY_MIGRATIONS" = "true" ]; then MESSAGE+="๐๏ธ Migrations: applied%0A"; fi
+ if [ "$DEPLOY_MIGRATIONS" = "true" ]; then MESSAGE+="๐๏ธ System (Migrations): deployed%0A"; fi
if [ "$DEPLOY_TELEGRAM" = "true" ]; then MESSAGE+="๐ค Telegram: deployed%0A"; fi
if [ "$DEPLOY_BALANCER" = "true" ]; then MESSAGE+="โ๏ธ Balancer: deployed%0A"; fi
if [ "$DEPLOY_ADMIN" = "true" ]; then MESSAGE+="๐ง Admin: deployed%0A"; fi
- if [ "$DEPLOY_TELEPHONY" = "true" ]; then MESSAGE+="๐ Telephony: deployed%0A"; fi # ๐
+ if [ "$DEPLOY_TELEPHONY" = "true" ]; then MESSAGE+="๐ Telephony: deployed%0A"; fi
MESSAGE+="%0Aโฐ $(date '+%Y-%m-%d %H:%M:%S')"
- curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" \
- -d "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" -d "parse_mode=HTML" -d "text=$MESSAGE"
+ curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" -d "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" -d "parse_mode=HTML" -d "text=$MESSAGE"
fi
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- # ะจะะ 13: ะฃะฒะตะดะพะผะปะตะฝะธะต ะพะฑ ะพัะธะฑะบะต
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- name: ๐จ Notify Failure
if: failure()
run: |
- for service in "$TELEGRAM_SERVICE" "$BALANCER_SERVICE" "$ADMIN_SERVICE" "$TELEPHONY_SERVICE"; do
+ for service in "$MIGRATIONS_SERVICE" "$TELEGRAM_SERVICE" "$BALANCER_SERVICE" "$ADMIN_SERVICE" "$TELEPHONY_SERVICE"; do
echo "๐ $service logs:"
sudo journalctl -u "$service" -n 20 --no-pager || true
done
@@ -389,22 +360,18 @@ jobs:
MESSAGE="โ Deployment failed%0A%0A"
MESSAGE+="๐ฟ Branch: ${{ github.ref_name }}%0A"
MESSAGE+="โฎ๏ธ Rollback executed%0A"
- curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" \
- -d "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" -d "parse_mode=HTML" -d "text=$MESSAGE"
+ curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" -d "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" -d "parse_mode=HTML" -d "text=$MESSAGE"
fi
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- # ะจะะ 14: ะัะพะณะพะฒะฐั ัะฒะพะดะบะฐ
- # โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ
- name: ๐ Deployment Summary
if: always()
run: |
echo "โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ"
echo "๐ DEPLOYMENT SUMMARY"
echo "โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ"
- echo "Migrations: ${DEPLOY_MIGRATIONS:-false}"
- echo "Telegram bot: ${DEPLOY_TELEGRAM:-false}"
- echo "Balancer: ${DEPLOY_BALANCER:-false}"
- echo "Admin: ${DEPLOY_ADMIN:-false}"
- echo "Telephony: ${DEPLOY_TELEPHONY:-false}" # ๐
+ echo "System (Migrations): ${DEPLOY_MIGRATIONS:-false}"
+ echo "Telegram bot: ${DEPLOY_TELEGRAM:-false}"
+ echo "Balancer: ${DEPLOY_BALANCER:-false}"
+ echo "Admin: ${DEPLOY_ADMIN:-false}"
+ echo "Telephony: ${DEPLOY_TELEPHONY:-false}"
echo "โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ"
\ No newline at end of file