@@ -36,12 +36,17 @@ jobs:
3636 m_or_d="$(printf '%s' "${COMMENT}" |
3737 sed -n 's=^bors *\(merge\|r+\) *$=ready-to-merge=p; s=^bors *d.*=delegated=p' | head -1)"
3838
39+ remove_labels="$(printf '%s' "${COMMENT}" |
40+ sed -n 's=^bors *\(r\|d\)- *$=remove-labels' | head -1)"
41+
3942 printf $'"bors delegate" or "bors merge" found? \'%s\'\n' "${m_or_d}"
43+ printf $'"bors r-" or "bors d-" found? \'%s\'\n' "${remove_labels}"
4044 printf $'AUTHOR: \'%s\'\n' "${AUTHOR}"
4145 printf $'PR_NUMBER: \'%s\'\n' "${{ github.event.issue.number }}${{ github.event.pull_request.number }}"
4246 printf $'%s' "${{ github.event.issue.number }}${{ github.event.pull_request.number }}" | hexdump -cC
4347
4448 printf $'mOrD=%s\n' "${m_or_d}" >> "${GITHUB_OUTPUT}"
49+ printf $'removeLabels=%s\n' "${remove_labels}" >> "${GITHUB_OUTPUT}"
4550 if [ "${AUTHOR}" == 'leanprover-community-mathlib4-bot' ] ||
4651 [ "${AUTHOR}" == 'leanprover-community-bot-assistant' ]
4752 then
8792 --header 'authorization: Bearer ${{ secrets.TRIAGE_TOKEN }}'
8893 done
8994
95+ - name : On bors r/d-, remove ready-to-merge or delegated label
96+ if : ${{ ! steps.merge_or_delegate.outputs.removeLabels == '' &&
97+ steps.user_permission.outputs.require-result == 'true' }}
98+ id : remove_labels
99+ name : Remove "ready-to-merge" and "delegated"
100+ # we use curl rather than octokit/request-action so that the job won't fail
101+ # (and send an annoying email) if the labels don't exist
102+ run : |
103+ for label in ready-to-merge delegated; do
104+ curl --request DELETE \
105+ --url "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}${{ github.event.pull_request.number }}/labels/${label}" \
106+ --header 'authorization: Bearer ${{ secrets.TRIAGE_TOKEN }}'
107+ done
108+
90109 - name : Set up Python
91110 if : ${{ ! steps.merge_or_delegate.outputs.mOrD == '' &&
92111 ( steps.user_permission.outputs.require-result == 'true' ||
0 commit comments