From fc64d2a8daf08ddf8bc40e3edb74413296600f85 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Mon, 17 Jul 2023 09:23:08 -0600 Subject: [PATCH] .github: Fix cherry-pick reminder issues (cherry picked from commit 8aba4a4f880950d740a9032245fa12cca99ab1c7) --- .github/workflows/PROpenedOrUpdated.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/PROpenedOrUpdated.yml b/.github/workflows/PROpenedOrUpdated.yml index 82c905410d..3cbab5c2f3 100644 --- a/.github/workflows/PROpenedOrUpdated.yml +++ b/.github/workflows/PROpenedOrUpdated.yml @@ -18,6 +18,13 @@ jobs: PROpenUpdateUnitTests: runs-on: ubuntu-latest steps: + - name: Job Start Delay + env: + JOB_START_DELAY_SEC: ${{vars.PR_JOB_START_DELAY_SEC}} + run: | + # Give the user a chance to add their "cherry-pick-to" comments + sleep ${JOB_START_DELAY_SEC:-60} + - name: Get Token needed to add reviewers if: github.event.action == 'opened' id: get_workflow_token @@ -37,12 +44,17 @@ jobs: github_token: ${{secrets.GITHUB_TOKEN}} - name: Add cherry-pick reminder - if: ${{ steps.getbranches.outputs.branch_count == 0 || steps.getbranches.outputs.forced_none != 'true' }} env: GITHUB_TOKEN: ${{steps.get_workflow_token.outputs.token}} GH_TOKEN: ${{steps.get_workflow_token.outputs.token}} CHERRY_PICK_REMINDER: ${{vars.CHERRY_PICK_REMINDER}} + BRANCHES_OUTPUT: ${{toJSON(steps.getbranches.outputs)}} + BRANCH_COUNT: ${{steps.getbranches.outputs.branch_count}} + FORCED_NONE: ${{steps.getbranches.outputs.forced_none}} run: | + # If the user already added "cherry-pick-to" comments + # we don't need to remind them. + ( $FORCED_NONE || [ $BRANCH_COUNT -gt 0 ] ) && { echo "No reminder needed." ; exit 0 ; } IFS=$'; \n' # If there's already a reminder comment, don't add another one. ADD_COMMENT=true