.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 "parse_mode=HTML" \
-                  -d "text='"'\$SUCCESS_DEPLOY_MESSAGE'"'" > /dev/null
+                  --data-urlencode "text=✅ <b>Деплой успешен!</b>%0A%0AСервер применил релиз: <code>${REF_NAME}</code>" > /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 "parse_mode=HTML" \
-                  -d "text='"'\$FAILURE_DEPLOY_MESSAGE'"'" > /dev/null
+                  --data-urlencode "text=❌ <b>Ошибка деплоя!</b>%0A%0AСервер <b>не</b> применил релиз: <code>${REF_NAME}</code>" > /dev/null
 
                 curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendDocument" \
                   --proxy "${PROXY_URL}" \

.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=💬 <b>Test message!</b> Релиз: <code>${{ gitea.ref_name }}</code>"
+              --data-urlencode "text=💬 Test message"
           EOT