From cfa7bb24af339a26e0995d00cb89c562e9d87b3d Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 25 Mar 2025 10:22:37 +0100 Subject: [PATCH] Update ci-trigger.yml Signed-off-by: Miro Stauder --- .github/workflows/ci-trigger.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-trigger.yml b/.github/workflows/ci-trigger.yml index 1b24b98a6..85fe49af5 100644 --- a/.github/workflows/ci-trigger.yml +++ b/.github/workflows/ci-trigger.yml @@ -14,18 +14,19 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | set +e - set -x + #set -x - echo "Get run id: '${{ github.ref_name }} ${{ github.workflow }} ${{ github.sha }}'" + RUNNAME="${{ github.head_ref || github.ref_name }} CI-builds ${{ github.event.after || github.sha }}" + echo "Get run id: '${RUNNAME}' ..." sleep 5 - RUNID=$(gh -R ${{ github.repository }} run list -w CI-builds -s in_progress | grep '${{ github.ref_name }} CI-builds ${{ github.sha }}' | grep -Po '(?<=workflow_run)\s+\d+') + RUNID=$(gh -R ${{ github.repository }} run list -w CI-builds -s in_progress | grep "${RUNNAME}" | grep -Po '(?<=workflow_run)\s+\d+') while [[ -z ${RUNID} ]]; do sleep 5 - RUNID=$(gh -R ${{ github.repository }} run list -w CI-builds -s in_progress | grep '${{ github.ref_name }} CI-builds ${{ github.sha }}' | grep -Po '(?<=workflow_run)\s+\d+') + RUNID=$(gh -R ${{ github.repository }} run list -w CI-builds -s in_progress | grep "${RUNNAME}" | grep -Po '(?<=workflow_run)\s+\d+') done - echo "Run id: '${RUNID}' : '${{ github.ref_name }} ${{ github.workflow }} ${{ github.sha }}'" + echo "Got run id: '${RUNNAME}' : '${RUNID}'" - echo "Trigger workflow_run[in_progress]: '${{ github.ref_name }} ${{ github.workflow }} ${{ github.sha }}'" + echo "Trigger workflow_run[in_progress]: '${RUNNAME}'" sleep 5 # this blocks until the run is finished gh -R ${{ github.repository }} run watch -i 30 ${RUNID} >/dev/null