diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 1290363..673be85 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: inputs: ref: - description: "Git ref (тег для релиза или отката, напр. v1.5.0 или v1.4.1)" + description: "Ветка или тег: main = как на Forgejo; v1.7.0 = тег. Не путать с 1.7.0 без v." required: true default: "main" @@ -51,15 +51,23 @@ jobs: command_timeout: 20m script: | set -euo pipefail + REF="${{ steps.pick.outputs.ref }}" cd "${{ secrets.DEPLOY_PATH }}" + echo "=== deploy REF=$REF ===" git fetch origin --tags --prune - git checkout "${{ steps.pick.outputs.ref }}" + git checkout "$REF" # Теги не дают refs/remotes/origin/<тег> — только ветки; для v* срабатывает else. - if git show-ref --verify --quiet "refs/remotes/origin/${{ steps.pick.outputs.ref }}"; then - git reset --hard "origin/${{ steps.pick.outputs.ref }}" + if git show-ref --verify --quiet "refs/remotes/origin/$REF"; then + git reset --hard "origin/$REF" else - git reset --hard "${{ steps.pick.outputs.ref }}" + git reset --hard "$REF" fi - docker compose build + echo "=== git HEAD ===" + git log -1 --oneline + echo "=== docker compose version ===" + docker compose version + echo "=== docker compose build ===" + docker compose build --progress=plain + echo "=== docker compose up ===" docker compose up -d docker compose ps