fix(deploy-stage): workflow_dispatch и clone DevOps с master
CI / test (push) Failing after 7m51s

Повтор run 109 на теге v0.1.1 брал старый promote; promote/prune теперь
клонируют EventHubDevOps с master, dispatch позволяет указать sha и tag.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-07-11 16:03:31 +03:00
parent 3b6c20ac34
commit 2abf3d0edb
2 changed files with 46 additions and 6 deletions
+21 -6
View File
@@ -5,6 +5,15 @@ on:
tags: tags:
- 'v*' - 'v*'
workflow_dispatch: workflow_dispatch:
inputs:
release_tag:
description: 'Release tag (например v0.1.1)'
required: true
default: 'v0.1.1'
sha_tag:
description: 'Образ sha-* (например sha-3f5dde498652)'
required: true
default: 'sha-3f5dde498652'
env: env:
REGISTRY: git.sabilin.com/eventhub REGISTRY: git.sabilin.com/eventhub
@@ -13,19 +22,25 @@ jobs:
deploy-stage-core: deploy-stage-core:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Compute image tags - name: Compute image tags
id: meta id: meta
run: | run: |
echo "sha_tag=sha-${GITHUB_SHA::12}" >> "$GITHUB_OUTPUT" set -euo pipefail
echo "release_tag=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT" if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
echo "sha_tag=${{ github.event.inputs.sha_tag }}" >> "$GITHUB_OUTPUT"
echo "release_tag=${{ github.event.inputs.release_tag }}" >> "$GITHUB_OUTPUT"
else
echo "sha_tag=sha-${GITHUB_SHA::12}" >> "$GITHUB_OUTPUT"
echo "release_tag=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
fi
- name: Wait for Docker daemon - name: Wait for Docker daemon
run: bash scripts/ensure-docker-daemon.sh 240 run: bash scripts/ensure-docker-daemon.sh 240
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v3
- name: Login to registry - name: Login to registry
uses: docker/login-action@v2 uses: docker/login-action@v2
@@ -39,7 +54,7 @@ jobs:
REGISTRY_USER: ${{ secrets.REGISTRY_USER }} REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
run: | run: |
bash scripts/run-promote-images.sh \ bash scripts/clone-devops-run.sh scripts/promote-images.sh \
"${{ steps.meta.outputs.sha_tag }}" \ "${{ steps.meta.outputs.sha_tag }}" \
"${{ steps.meta.outputs.release_tag }}" \ "${{ steps.meta.outputs.release_tag }}" \
stage \ stage \
@@ -49,7 +64,7 @@ jobs:
env: env:
REGISTRY_USER: ${{ secrets.REGISTRY_USER }} REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
run: bash scripts/run-registry-prune.sh run: bash scripts/clone-devops-run.sh scripts/prune-registry-images.sh
- name: Deploy core on stage via SSH - name: Deploy core on stage via SSH
uses: appleboy/ssh-action@v0.1.5 uses: appleboy/ssh-action@v0.1.5
+25
View File
@@ -0,0 +1,25 @@
#!/usr/bin/env bash
# CI: clone EventHubDevOps и вызвать скрипт (не зависит от checkout тега).
# Usage: clone-devops-run.sh <script-relative-to-devops> [args...]
set -euo pipefail
SCRIPT_REL="${1:?script path under devops/, e.g. scripts/promote-images.sh}"
shift
DEVOPS_REPO="${DEVOPS_REPO:-https://git.sabilin.com/EventHub/EventHubDevOps.git}"
DEVOPS_REF="${DEVOPS_REF:-master}"
if [[ -z "${REGISTRY_USER:-}" || -z "${REGISTRY_PASSWORD:-}" ]]; then
echo "REGISTRY_USER/PASSWORD required"
exit 1
fi
WORKDIR="$(mktemp -d)"
trap 'rm -rf "${WORKDIR}"' EXIT
repo_path="${DEVOPS_REPO#https://}"
git clone --depth 1 --branch "${DEVOPS_REF}" \
"https://${REGISTRY_USER}:${REGISTRY_PASSWORD}@${repo_path}" \
"${WORKDIR}/devops"
exec bash "${WORKDIR}/devops/${SCRIPT_REL}" "$@"