версии будут в сообщении

This commit is contained in:
Serafim Urukov 2021-10-31 17:49:54 +03:00
parent 05f29bb382
commit 84658b825b
4 changed files with 9 additions and 6 deletions

View File

@ -25,7 +25,8 @@ jobs:
'
cd Carolyn &&
git pull &&
export CAROLYN_DEPLOY_INFO="$(git rev-parse HEAD)" &&
export CAROLYN_DEPLOY_ID="$(git rev-parse HEAD)" &&
export CAROLYN_DEPLOY_VERSION="$(git describe --tags)" &&
docker-compose down &&
docker-compose up -d
'

View File

@ -397,8 +397,9 @@ def variant(update: Update, context: CallbackContext):
def about(update: Update, context: CallbackContext):
"""Получить инфу о развертывании бота."""
deploy_info = os.environ.get("CAROLYN_DEPLOY_INFO", "")
update.message.reply_html(MESSAGES.Deploy.about(deploy_info))
commit_id = os.environ.get("CAROLYN_DEPLOY_ID", "")
verison = os.environ.get("CAROLYN_DEPLOY_VERSION", "")
update.message.reply_html(MESSAGES.Deploy.about(commit_id, verison))
def error(update: Update, context: CallbackContext):

View File

@ -113,8 +113,8 @@ class Messages:
class Deploy:
@staticmethod
def about(commit_id: str):
return f" Информация о сборке:\n<a href='https://github.com/Faridik/Carolyn/commit/{commit_id}'>{commit_id:7}</a>"
def about(commit_id: str, git_describe):
return f" Версия сборки:\n<a href='https://github.com/Faridik/Carolyn/commit/{commit_id}'>{git_describe}</a>"
class Spreadsheets:
pass

View File

@ -12,7 +12,8 @@ services:
telegrambot:
container_name: "carolyn-telegrambot"
environment:
- CAROLYN_DEPLOY_INFO
- CAROLYN_DEPLOY_ID
- CAROLYN_DEPLOY_VERSION
restart: always
build: ./TelegramBot
volumes: