Skip to content

Commit 220d428

Browse files
authored
fix: correct typo 'atemps' to 'attempts' in detect-conflicting-prs.yml
1 parent 23ecd47 commit 220d428

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

.github/workflows/detect-conflicting-prs.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
name: "Detect conflicting PRs"
2-
32
on:
43
workflow_dispatch: # manually
54
# So that PRs touching the same files as the push are updated
@@ -8,7 +7,6 @@ on:
87
pull_request_target: # - A pull request (even with conflicts)
98
types:
109
- synchronize # pushing more commits
11-
1210
permissions:
1311
# no checkouts/branching needed
1412
contents: none
@@ -23,23 +21,20 @@ concurrency:
2321
jobs:
2422
detect-prs:
2523
name: Detect
26-
if: ${{ github.actor != 'dependabot[bot]' }} # avoid dependabot PRs
24+
if: ${{ github.actor != 'dependabot[bot]' }} # avoid dependabot PRs
2725
runs-on: ubuntu-latest
2826
steps:
29-
3027
- name: Label conflicting PRs that are open
3128
id: pr-labeler
3229
uses: eps1lon/actions-label-merge-conflict@v3.0.3
3330
with:
34-
repoToken: ${{ secrets.GITHUB_TOKEN }}
35-
retryAfter: 30 # seconds
36-
retryMax: 5 # atemps
31+
repoToken: ${{ secrets.GITHUB_TOKEN }}
32+
retryAfter: 30 # seconds
33+
retryMax: 5 # attempts
3734
dirtyLabel: conflicts
3835
commentOnDirty: |
3936
Oh no 😟! Conflicts have been found.
40-
4137
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.
42-
4338
Thanks in advance for your effort and patience ❤️!
4439
continueOnMissingPermissions: true
4540

@@ -69,5 +64,5 @@ jobs:
6964
| 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' \
7065
>> $GITHUB_STEP_SUMMARY
7166
env:
72-
GITHUB_PUBLIC_URL: ${{ format('{0}/{1}/pull', github.server_url, github.repository) }}
67+
GITHUB_PUBLIC_URL: ${{ format('{0}/{1}/pull', github.server_url, github.repository) }}
7368
INPUT_PRS: ${{ steps.set-prs.outputs.prs }}

0 commit comments

Comments
 (0)