Skip to content
This repository has been archived by the owner on Jul 25, 2024. It is now read-only.

Commit

Permalink
[dependabot->github-actions]: Bump eps1lon/actions-label-merge-confli…
Browse files Browse the repository at this point in the history
…ct from 3.0.0 to 3.0.1 (#15)

Bumps
[eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict)
from 3.0.0 to 3.0.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/eps1lon/actions-label-merge-conflict/releases">eps1lon/actions-label-merge-conflict's
releases</a>.</em></p>
<blockquote>
<h2>3.0.1</h2>
<h2>What's Changed</h2>
<ul>
<li>docs: Added a note about label removal to README.md by <a
href="https://github.com/AlexSkrypnyk"><code>@​AlexSkrypnyk</code></a>
in <a
href="https://redirect.github.com/eps1lon/actions-label-merge-conflict/pull/122">eps1lon/actions-label-merge-conflict#122</a></li>
<li>fix: Handle error when label is not available by <a
href="https://github.com/kiblik"><code>@​kiblik</code></a> in <a
href="https://redirect.github.com/eps1lon/actions-label-merge-conflict/pull/123">eps1lon/actions-label-merge-conflict#123</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/AlexSkrypnyk"><code>@​AlexSkrypnyk</code></a>
made their first contribution in <a
href="https://redirect.github.com/eps1lon/actions-label-merge-conflict/pull/122">eps1lon/actions-label-merge-conflict#122</a></li>
<li><a href="https://github.com/kiblik"><code>@​kiblik</code></a> made
their first contribution in <a
href="https://redirect.github.com/eps1lon/actions-label-merge-conflict/pull/123">eps1lon/actions-label-merge-conflict#123</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/eps1lon/actions-label-merge-conflict/compare/v3.0.0...v3.0.1">https://github.com/eps1lon/actions-label-merge-conflict/compare/v3.0.0...v3.0.1</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md">eps1lon/actions-label-merge-conflict's
changelog</a>.</em></p>
<blockquote>
<h1>Changelog</h1>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/eps1lon/actions-label-merge-conflict/commit/6d74047dcef155976a15e4a124dde2c7fe0c5522"><code>6d74047</code></a>
fix: Handle error when label is not available (<a
href="https://redirect.github.com/eps1lon/actions-label-merge-conflict/issues/123">#123</a>)</li>
<li><a
href="https://github.com/eps1lon/actions-label-merge-conflict/commit/e77c7ed67896b8b0894a6fc9270b6eb1f6df06fd"><code>e77c7ed</code></a>
docs: Added a note about label removal to README.md (<a
href="https://redirect.github.com/eps1lon/actions-label-merge-conflict/issues/122">#122</a>)</li>
<li><a
href="https://github.com/eps1lon/actions-label-merge-conflict/commit/50edcb54ae33b225e19c443252c634acfeaac946"><code>50edcb5</code></a>
chore(deps): update dependency typescript to v5.4.5 (<a
href="https://redirect.github.com/eps1lon/actions-label-merge-conflict/issues/120">#120</a>)</li>
<li>See full diff in <a
href="https://github.com/eps1lon/actions-label-merge-conflict/compare/v3.0.0...v3.0.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=eps1lon/actions-label-merge-conflict&package-manager=github_actions&previous-version=3.0.0&new-version=3.0.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
  • Loading branch information
Zorono authored May 14, 2024
2 parents 1a8dd12 + 3f1b93e commit 730465b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/merge-conflict.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check if PRs are have merge conflicts
uses: eps1lon/actions-label-merge-conflict@v3.0.0
uses: eps1lon/actions-label-merge-conflict@v3.0.1
with:
dirtyLabel: "Merge Conflicts"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
Expand Down

0 comments on commit 730465b

Please sign in to comment.