Skip to content

Commit

Permalink
revert name changes
Browse files Browse the repository at this point in the history
  • Loading branch information
leiicamundi committed Sep 23, 2024
1 parent 32ee1de commit 48ac4c7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/automerge-global.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
default: app/renovate

jobs:
# do not change the name
approve-and-auto-merge:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -73,17 +74,16 @@ jobs:
: # Approve the PR and add a comment with workflow reference
workflow_url="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
: # Check if the PR has already been approved
: # Check if the PR has already been approved and prevent multiple comments
approved=$(gh pr view ${{ github.event.pull_request.number }} --json reviewDecision --jq '.reviewDecision')
if [ "$approved" = "APPROVED" ]; then
echo "This PR has already been approved."
else
gh pr review ${{ github.event.pull_request.number }} --approve
gh pr comment ${{ github.event.pull_request.number }} --body "This PR has been approved as it does not involve major changes. Workflow run: [See details](${workflow_url})"
gh pr comment ${{ github.event.pull_request.number }} --body "This PR has been auto-approved as it does not involve major changes. Workflow run: [See details](${workflow_url})"
fi
gh pr comment ${{ github.event.pull_request.number }} --body "Automerging this PR. Workflow run: [See details](${workflow_url})"
# gh pr merge ${{ github.event.pull_request.number }} --auto --squash
gh pr merge ${{ github.event.pull_request.number }} --auto --squash
env:
GH_TOKEN: ${{ steps.generate-github-token.outputs.token }}
3 changes: 0 additions & 3 deletions .github/workflows/renovate-automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,4 @@ concurrency:
jobs:
renovate-automerge:
uses: ./.github/workflows/automerge-global.yml
with:
# TODO: revert this before merge :)
author-name: leiicamundi
secrets: inherit

0 comments on commit 48ac4c7

Please sign in to comment.