diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 727894e..2dacc35 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -73,18 +73,6 @@ jobs:
chmod 600 secrets/*.txt
EOT
- - name: ✍️ Prepare success deploy message
- id: prepare_success_deploy_message
- uses: ./.gitea/actions/telegram-message-escape
- with:
- message: '✅ *Деплой успешен!* %0A%0AСервер применил релиз: `${{ gitea.ref_name }}`'
-
- - name: ✍️ Prepare failure deploy message
- id: prepare_failure_deploy_message
- uses: ./.gitea/actions/telegram-message-escape
- with:
- message: '❌ *Ошибка деплоя!* %0A%0AСервер *не* применил релиз: `${{ gitea.ref_name }}`'
-
- name: 🚀 Run new containers
env:
SSHPASS: ${{ secrets.SSH_PASSWORD }}
@@ -95,8 +83,6 @@ jobs:
TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_DEPLOY_BOT_TOKEN }}
TELEGRAM_CHAT: ${{ secrets.TELEGRAM_DEPLOY_CHAT_ID }}
PROXY_URL: ${{ secrets.PROXY_URL }}
- SUCCESS_DEPLOY_MESSAGE: ${{ steps.prepare_success_deploy_message.outputs.escaped_message }}
- FAILURE_DEPLOY_MESSAGE: ${{ steps.prepare_failure_deploy_message.outputs.escaped_message }}
run: |
sshpass -e ssh -p 22 "$SSH_USERNAME@$SSH_HOST" bash -s << EOT
set -e
@@ -109,14 +95,14 @@ jobs:
curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendMessage" \
--proxy "${PROXY_URL}" \
-d "chat_id=${TELEGRAM_CHAT}" \
- -d "parse_mode=MarkdownV2" \
- -d "text='"'\$SUCCESS_DEPLOY_MESSAGE'"'" > /dev/null
+ -d "parse_mode=HTML" \
+ --data-urlencode "text=✅ Деплой успешен!%0A%0AСервер применил релиз: ${REF_NAME}" > /dev/null
else
curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendMessage" \
--proxy "${PROXY_URL}" \
-d "chat_id=${TELEGRAM_CHAT}" \
- -d "parse_mode=MarkdownV2" \
- -d "text='"'\$FAILURE_DEPLOY_MESSAGE'"'" > /dev/null
+ -d "parse_mode=HTML" \
+ --data-urlencode "text=❌ Ошибка деплоя!%0A%0AСервер не применил релиз: ${REF_NAME}" > /dev/null
curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendDocument" \
--proxy "${PROXY_URL}" \
diff --git a/.gitea/workflows/test_telegram_deploy_bot.yaml b/.gitea/workflows/test_telegram_deploy_bot.yaml
index 7d1c5d3..a4e49ca 100644
--- a/.gitea/workflows/test_telegram_deploy_bot.yaml
+++ b/.gitea/workflows/test_telegram_deploy_bot.yaml
@@ -15,12 +15,6 @@ jobs:
with:
ssh_host: ${{ secrets.SSH_HOST }}
- - name: ✍️ Prepare message
- id: prepare_message
- uses: ./.gitea/actions/telegram-message-escape
- with:
- message: 💬 Test message
-
- name: 💬 Send message
env:
SSHPASS: ${{ secrets.SSH_PASSWORD }}
@@ -38,5 +32,5 @@ jobs:
--proxy "${PROXY_URL}" \
-d "chat_id=${TELEGRAM_CHAT}" \
-d "parse_mode=HTML" \
- --data-urlencode "text=💬 Test message! Релиз: ${{ gitea.ref_name }}"
+ --data-urlencode "text=💬 Test message"
EOT
\ No newline at end of file