⬆ Bump the github-actions group with 2 updates

[dependabot]

Bumps the github-actions group with 2 updates: eps1lon/actions-label-merge-conflict and mxschmitt/action-tmate.

Updates eps1lon/actions-label-merge-conflict from 3.0.3 to 3.1.0

Release notes

Sourced from eps1lon/actions-label-merge-conflict's releases.

v3.1.0

What's Changed

• Add better permissions defaults for the example by @​oliviertassinari in eps1lon/actions-label-merge-conflict#151
• Update Node.js to 24 by @​oliviertassinari in eps1lon/actions-label-merge-conflict#152
• release: 3.1.0 by @​eps1lon in eps1lon/actions-label-merge-conflict#153

New Contributors

• @​oliviertassinari made their first contribution in eps1lon/actions-label-merge-conflict#151

Full Changelog: eps1lon/actions-label-merge-conflict@v3.0.3...v3.1.0

Changelog

Sourced from eps1lon/actions-label-merge-conflict's changelog.

Changelog

3.1.0

• Update Node.js to 24 (#152)

3.0.3

• Ensure outputs is populated (#136)

3.0.2

• Handle error when label is not available (part 2) (#126)

3.0.1

• Handle error when label is not available (#123)

3.0.0

• Update to node20 (#115)

2.1.0

• Address set-output deprecation (#92 by @​NotMyFault)
• Fix CVE-2022-35954 (#92 by @​NotMyFault)

2.0.1

• Improve retry logic (#31 by @​eps1lon)

2.0.0

• Only update PRs based off of the branch in the push event Previously we checked every open PR. Since a push to a branch can only create merge conflicts with that branch we can limit the set of checked PRs. This should help repositories with lots of PRs targetting different branches with rate limiting.
• Only leave comments if the dirtyLabel was added or removed

1.4.0

• Allow warning only if secrets aren't available (#22 by @​baywet)
• Remove requirement for removeOnDirtyLabel (#21 by @​baywet)

1.3.0

• set PRs and their dirty state as output (#17 by @​baywet)

Commits

• 0273be7 release: 3.1.0 (#153)
• 9d4606b Update Node.js to 24 (#152)
• 62d0db0 docs: Add better permissions defaults for the example (#151)
• See full diff in compare view

Updates mxschmitt/action-tmate from 3.23 to 3.24

Release notes

Sourced from mxschmitt/action-tmate's releases.

v3.24

What's Changed

• chore(deps): bump js-yaml from 3.14.1 to 3.14.2 by @​dependabot[bot] in mxschmitt/action-tmate#236
• chore(deps): bump minimatch from 3.1.2 to 3.1.5 by @​dependabot[bot] in mxschmitt/action-tmate#237
• chore(deps-dev): bump picomatch from 2.3.1 to 2.3.2 by @​dependabot[bot] in mxschmitt/action-tmate#238
• chore(deps-dev): bump @​babel/plugin-transform-modules-systemjs from 7.22.11 to 7.29.4 by @​dependabot[bot] in mxschmitt/action-tmate#240
• Update Node.js runtime from 20 to 24 by @​Copilot in mxschmitt/action-tmate#242

New Contributors

• @​Copilot made their first contribution in mxschmitt/action-tmate#242

Full Changelog: mxschmitt/action-tmate@v3.23...v3.24

Commits

• 35b54af Update Node.js runtime from 20 to 24 (#242)
• ebce6f7 chore(deps-dev): bump @​babel/plugin-transform-modules-systemjs (#240)
• bc851d8 chore(deps-dev): bump picomatch from 2.3.1 to 2.3.2 (#238)
• 6c825b1 chore(deps): bump minimatch from 3.1.2 to 3.1.5 (#237)
• 10570f9 Merge pull request #236 from mxschmitt/dependabot/npm_and_yarn/js-yaml-3.14.2
• 7b3d87e chore(deps): bump js-yaml from 3.14.1 to 3.14.2
• See full diff in compare view

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 commands and options

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 show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
• @dependabot ignore <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
• @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
• @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
• @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
• @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions