Skip to content

fix: workflow corrections for comment-pr.yml and detect-conflicting-prs.yml #12968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix: workflow corrections for comment-pr.yml and detect-conflicting-prs.yml #12968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23ecd47
fix: correct broken shell command syntax in comment-pr.yml workflow
MathewAddala Oct 31, 2025
220d428
fix: correct typo 'atemps' to 'attempts' in detect-conflicting-prs.yml
MathewAddala Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/comment-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ jobs:
run: |
if [ -s error.log ]
then
gh pr comment $(<PRurl) -b "Linter failed, fix the error(s):
\`\`\`
gh pr comment $(cat pr) --body "❌ Linting failed
\`\`\`
$(cat error.log)
\`\`\`"
gh pr edit $(<PRurl) --add-label "linter error"
gh pr edit $(cat pr) --remove-label "passed"
else
gh pr edit $(<PRurl) --remove-label "linter error"
gh pr edit $(cat pr) --add-label "passed"
fi
15 changes: 5 additions & 10 deletions .github/workflows/detect-conflicting-prs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name: "Detect conflicting PRs"

on:
workflow_dispatch: # manually
# So that PRs touching the same files as the push are updated
Expand All @@ -8,7 +7,6 @@ on:
pull_request_target: # - A pull request (even with conflicts)
types:
- synchronize # pushing more commits

permissions:
# no checkouts/branching needed
contents: none
Expand All @@ -23,23 +21,20 @@ concurrency:
jobs:
detect-prs:
name: Detect
if: ${{ github.actor != 'dependabot[bot]' }} # avoid dependabot PRs
if: ${{ github.actor != 'dependabot[bot]' }} # avoid dependabot PRs
runs-on: ubuntu-latest
steps:

- name: Label conflicting PRs that are open
id: pr-labeler
uses: eps1lon/[email protected]
with:
repoToken: ${{ secrets.GITHUB_TOKEN }}
retryAfter: 30 # seconds
retryMax: 5 # atemps
repoToken: ${{ secrets.GITHUB_TOKEN }}
retryAfter: 30 # seconds
retryMax: 5 # attempts
dirtyLabel: conflicts
commentOnDirty: |
Oh no 😟! Conflicts have been found.

Please 🙏, take a moment and [address the merge conflicts](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts) of your pull request before we can evaluate it again.

Thanks in advance for your effort and patience ❤️!
continueOnMissingPermissions: true

Expand Down Expand Up @@ -69,5 +64,5 @@ jobs:
| jq --raw-output 'map("| [#\(.number)](\(env.GITHUB_PUBLIC_URL)/\(.number)) | \(if (.dirty) then "❌" else "✔️" end) |") | join("\n") | if (. == "") then "\nNo records.\n" else "\n| PR | Mergeable? |\n|---:|:----------:|\n\(.)\n" end' \
>> $GITHUB_STEP_SUMMARY
env:
GITHUB_PUBLIC_URL: ${{ format('{0}/{1}/pull', github.server_url, github.repository) }}
GITHUB_PUBLIC_URL: ${{ format('{0}/{1}/pull', github.server_url, github.repository) }}
INPUT_PRS: ${{ steps.set-prs.outputs.prs }}
Loading