mirror of
https://github.com/Faridik/Carolyn.git
synced 2026-07-08 05:11:52 +00:00
версии будут в сообщении
This commit is contained in:
parent
05f29bb382
commit
84658b825b
3
.github/workflows/deploy.yml
vendored
3
.github/workflows/deploy.yml
vendored
@ -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
|
||||
'
|
||||
|
||||
@ -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):
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user