From 657a69279f33a723a7e6a15acb30285b7dd3a2e9 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 27 Aug 2024 16:56:26 -0400 Subject: [PATCH] Fixes & improvements for the `actions\spring-dispatch-workflow-and-wait` --- .../spring-dispatch-workflow-and-wait/action.yml | 13 ++----------- .github/workflows/test-call-workflow-and-wait.yml | 2 +- .github/workflows/test-other-workflow-to-call.yml | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/actions/spring-dispatch-workflow-and-wait/action.yml b/.github/actions/spring-dispatch-workflow-and-wait/action.yml index ba8d7f4..bc5ccc1 100644 --- a/.github/actions/spring-dispatch-workflow-and-wait/action.yml +++ b/.github/actions/spring-dispatch-workflow-and-wait/action.yml @@ -16,11 +16,6 @@ inputs: runs: using: composite steps: - - - uses: actions/checkout@v4 - with: - show-progress: false - - name: Dispatch workflow and wait shell: bash env: @@ -29,11 +24,7 @@ runs: dispatchDate=$(date -Iseconds) workflowFile=${{ inputs.workflow }} - if [ '${{ inputs.inputs }}' ]; then - echo '${{ inputs.inputs }}' | gh workflow run $workflowFile --json - else - gh workflow run $workflowFile - fi + echo '${{ inputs.inputs }}' | gh workflow run $workflowFile --json sleep 60 @@ -45,7 +36,7 @@ runs: currentWorkflowRunUrl=$(echo "$run_data" | jq -r '.html_url') - echo "::notice title=Dispatched workflow run::$currentWorkflowRunUrl" + echo "::notice file=$workflowFile,title=Dispatched workflow run::$currentWorkflowRunUrl" while true; do run_data=$(gh api repos/$GITHUB_REPOSITORY/actions/runs/$currentWorkflowRunId) diff --git a/.github/workflows/test-call-workflow-and-wait.yml b/.github/workflows/test-call-workflow-and-wait.yml index f3e3460..3e50bf8 100644 --- a/.github/workflows/test-call-workflow-and-wait.yml +++ b/.github/workflows/test-call-workflow-and-wait.yml @@ -31,7 +31,7 @@ jobs: show-progress: false ref: ${{ env.WORKFLOWS_REF }} - - name: Build and Publish + - name: Dispatch Workflow timeout-minutes: 30 uses: ./spring-github-workflows/.github/actions/spring-dispatch-workflow-and-wait with: diff --git a/.github/workflows/test-other-workflow-to-call.yml b/.github/workflows/test-other-workflow-to-call.yml index 5cafc3b..9b72e92 100644 --- a/.github/workflows/test-other-workflow-to-call.yml +++ b/.github/workflows/test-other-workflow-to-call.yml @@ -13,4 +13,4 @@ jobs: steps: - run: | sleep 60 - echo "::notice The other workflow is done for ${{ inputs.anInput }}" + echo "::notice title=The other workflow is done for::${{ inputs.anInput }}"