fix: pass secrets directly to SSH scripts instead of using env
This commit is contained in:
26
.github/workflows/deploy.yml
vendored
26
.github/workflows/deploy.yml
vendored
@@ -36,10 +36,6 @@ jobs:
|
|||||||
echo "SERVER_USER: $([ -n '${{ vars.SERVER_USER || secrets.SERVER_USER }}' ] && echo '✅ Set' || echo '❌ Not set')"
|
echo "SERVER_USER: $([ -n '${{ vars.SERVER_USER || secrets.SERVER_USER }}' ] && echo '✅ Set' || echo '❌ Not set')"
|
||||||
|
|
||||||
- name: Validate Telegram Bot Tokens
|
- name: Validate Telegram Bot Tokens
|
||||||
env:
|
|
||||||
TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
|
|
||||||
TELEGRAM_TEST_BOT_TOKEN: ${{ secrets.TELEGRAM_TEST_BOT_TOKEN }}
|
|
||||||
ANON_BOT_TOKEN: ${{ secrets.ANON_BOT_TOKEN }}
|
|
||||||
uses: appleboy/ssh-action@v1.0.0
|
uses: appleboy/ssh-action@v1.0.0
|
||||||
with:
|
with:
|
||||||
host: ${{ vars.SERVER_HOST || secrets.SERVER_HOST }}
|
host: ${{ vars.SERVER_HOST || secrets.SERVER_HOST }}
|
||||||
@@ -48,6 +44,9 @@ jobs:
|
|||||||
port: ${{ vars.SSH_PORT || secrets.SSH_PORT || 22 }}
|
port: ${{ vars.SSH_PORT || secrets.SSH_PORT || 22 }}
|
||||||
script: |
|
script: |
|
||||||
set -e
|
set -e
|
||||||
|
export TELEGRAM_BOT_TOKEN="${{ secrets.TELEGRAM_BOT_TOKEN }}"
|
||||||
|
export TELEGRAM_TEST_BOT_TOKEN="${{ secrets.TELEGRAM_TEST_BOT_TOKEN }}"
|
||||||
|
export ANON_BOT_TOKEN="${{ secrets.ANON_BOT_TOKEN }}"
|
||||||
echo "🔍 Validating Telegram Bot tokens from GitHub Secrets..."
|
echo "🔍 Validating Telegram Bot tokens from GitHub Secrets..."
|
||||||
|
|
||||||
# Функция для проверки токена с retry
|
# Функция для проверки токена с retry
|
||||||
@@ -115,10 +114,6 @@ jobs:
|
|||||||
echo "✅ All token validations passed!"
|
echo "✅ All token validations passed!"
|
||||||
|
|
||||||
- name: Deploy to server
|
- name: Deploy to server
|
||||||
env:
|
|
||||||
TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
|
|
||||||
TELEGRAM_TEST_BOT_TOKEN: ${{ secrets.TELEGRAM_TEST_BOT_TOKEN }}
|
|
||||||
ANON_BOT_TOKEN: ${{ secrets.ANON_BOT_TOKEN }}
|
|
||||||
uses: appleboy/ssh-action@v1.0.0
|
uses: appleboy/ssh-action@v1.0.0
|
||||||
with:
|
with:
|
||||||
host: ${{ vars.SERVER_HOST || secrets.SERVER_HOST }}
|
host: ${{ vars.SERVER_HOST || secrets.SERVER_HOST }}
|
||||||
@@ -127,6 +122,9 @@ jobs:
|
|||||||
port: ${{ vars.SSH_PORT || secrets.SSH_PORT || 22 }}
|
port: ${{ vars.SSH_PORT || secrets.SSH_PORT || 22 }}
|
||||||
script: |
|
script: |
|
||||||
set -e
|
set -e
|
||||||
|
export TELEGRAM_BOT_TOKEN="${{ secrets.TELEGRAM_BOT_TOKEN }}"
|
||||||
|
export TELEGRAM_TEST_BOT_TOKEN="${{ secrets.TELEGRAM_TEST_BOT_TOKEN }}"
|
||||||
|
export ANON_BOT_TOKEN="${{ secrets.ANON_BOT_TOKEN }}"
|
||||||
echo "🚀 Starting deployment to production..."
|
echo "🚀 Starting deployment to production..."
|
||||||
|
|
||||||
# Функция для безопасной записи в историю деплоев с использованием flock
|
# Функция для безопасной записи в историю деплоев с использованием flock
|
||||||
@@ -562,9 +560,6 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Run Smoke Tests
|
- name: Run Smoke Tests
|
||||||
env:
|
|
||||||
TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
|
|
||||||
ANON_BOT_TOKEN: ${{ secrets.ANON_BOT_TOKEN }}
|
|
||||||
uses: appleboy/ssh-action@v1.0.0
|
uses: appleboy/ssh-action@v1.0.0
|
||||||
with:
|
with:
|
||||||
host: ${{ vars.SERVER_HOST || secrets.SERVER_HOST }}
|
host: ${{ vars.SERVER_HOST || secrets.SERVER_HOST }}
|
||||||
@@ -573,6 +568,8 @@ jobs:
|
|||||||
port: ${{ vars.SSH_PORT || secrets.SSH_PORT || 22 }}
|
port: ${{ vars.SSH_PORT || secrets.SSH_PORT || 22 }}
|
||||||
script: |
|
script: |
|
||||||
set -e
|
set -e
|
||||||
|
export TELEGRAM_BOT_TOKEN="${{ secrets.TELEGRAM_BOT_TOKEN }}"
|
||||||
|
export ANON_BOT_TOKEN="${{ secrets.ANON_BOT_TOKEN }}"
|
||||||
echo "🧪 Running smoke tests..."
|
echo "🧪 Running smoke tests..."
|
||||||
|
|
||||||
SMOKE_TEST_CHAT_ID="${SMOKE_TEST_CHAT_ID:--898316252}"
|
SMOKE_TEST_CHAT_ID="${SMOKE_TEST_CHAT_ID:--898316252}"
|
||||||
@@ -675,10 +672,6 @@ jobs:
|
|||||||
ref: main
|
ref: main
|
||||||
|
|
||||||
- name: Auto Rollback
|
- name: Auto Rollback
|
||||||
env:
|
|
||||||
TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
|
|
||||||
TELEGRAM_TEST_BOT_TOKEN: ${{ secrets.TELEGRAM_TEST_BOT_TOKEN }}
|
|
||||||
ANON_BOT_TOKEN: ${{ secrets.ANON_BOT_TOKEN }}
|
|
||||||
uses: appleboy/ssh-action@v1.0.0
|
uses: appleboy/ssh-action@v1.0.0
|
||||||
with:
|
with:
|
||||||
host: ${{ vars.SERVER_HOST || secrets.SERVER_HOST }}
|
host: ${{ vars.SERVER_HOST || secrets.SERVER_HOST }}
|
||||||
@@ -687,6 +680,9 @@ jobs:
|
|||||||
port: ${{ vars.SSH_PORT || secrets.SSH_PORT || 22 }}
|
port: ${{ vars.SSH_PORT || secrets.SSH_PORT || 22 }}
|
||||||
script: |
|
script: |
|
||||||
set -e
|
set -e
|
||||||
|
export TELEGRAM_BOT_TOKEN="${{ secrets.TELEGRAM_BOT_TOKEN }}"
|
||||||
|
export TELEGRAM_TEST_BOT_TOKEN="${{ secrets.TELEGRAM_TEST_BOT_TOKEN }}"
|
||||||
|
export ANON_BOT_TOKEN="${{ secrets.ANON_BOT_TOKEN }}"
|
||||||
echo "🔄 Starting automatic rollback after smoke tests failure..."
|
echo "🔄 Starting automatic rollback after smoke tests failure..."
|
||||||
|
|
||||||
# Функция для безопасного чтения истории деплоев с использованием flock
|
# Функция для безопасного чтения истории деплоев с использованием flock
|
||||||
|
|||||||
Reference in New Issue
Block a user