Improves fix for advisories/GHSA-82rp-4vmv-54wg

This commit is contained in:
Filipe PINTO 2023-06-08 10:14:37 +02:00 committed by GitHub
parent d7021b3e1a
commit 8e5c85c8b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -73,7 +73,7 @@ jobs:
- name: Notify user - name: Notify user
run: | run: |
if [[ "${{ env.PR_COMMENT }}" =~ "--force" ]] ; then if [[ "${PR_COMMENT}" =~ "--force" ]] ; then
order="/accept --force" order="/accept --force"
else else
order="/accept" order="/accept"
@ -192,7 +192,7 @@ jobs:
comment="🔨 Auto rebase from \`${{ env.BASE_REPO_FULL_NAME}}/${{ env.BASE_REF }}\` succeeds, \`${{ env.HEAD_REPO_FULL_NAME}}/${{ env.HEAD_REF }}\` now embeds these commits:<br>$(echo ; sed "s/+/-/g" ${{ env.REMAINING_COMMITS_FILE }})" comment="🔨 Auto rebase from \`${{ env.BASE_REPO_FULL_NAME}}/${{ env.BASE_REF }}\` succeeds, \`${{ env.HEAD_REPO_FULL_NAME}}/${{ env.HEAD_REF }}\` now embeds these commits:<br>$(echo ; sed "s/+/-/g" ${{ env.REMAINING_COMMITS_FILE }})"
echo " - ${comment}" echo " - ${comment}"
gh pr comment "${PR_NUMBER}" --body "${comment}" gh pr comment "${PR_NUMBER}" --body "${comment}"
if [[ "${{ env.PR_COMMENT }}" =~ "--force" ]] ; then if [[ "${PR_COMMENT}" =~ "--force" ]] ; then
order="/accept --force" order="/accept --force"
else else
order="/accept" order="/accept"
@ -275,7 +275,7 @@ jobs:
- name: Close pull request - name: Close pull request
run: | run: |
if [[ "${{ env.PR_COMMENT }}" =~ "--force" ]] ; then if [[ "${PR_COMMENT}" =~ "--force" ]] ; then
comment="✅ Pull request merged without waiting for checks and closed by \`${COMMENT_USER_LOGIN}\` with fast forward merge." comment="✅ Pull request merged without waiting for checks and closed by \`${COMMENT_USER_LOGIN}\` with fast forward merge."
else else
comment="✅ Pull request merged and closed by \`${COMMENT_USER_LOGIN}\` with fast forward merge." comment="✅ Pull request merged and closed by \`${COMMENT_USER_LOGIN}\` with fast forward merge."