Skip to content

Commit

Permalink
[Automated] Merge 5.x into master (#170)
Browse files Browse the repository at this point in the history
* fix(docker-monolithic): add stop_grace_period (#162)

* fix(linux): update mysql apt repo to 0.8.29 (#166)

* chore(deps): bump pascalgn/automerge-action from 0.15.6 to 0.16.2 (#169)

Bumps [pascalgn/automerge-action](https://github.com/pascalgn/automerge-action) from 0.15.6 to 0.16.2.
- [Release notes](https://github.com/pascalgn/automerge-action/releases)
- [Commits](pascalgn/automerge-action@v0.15.6...v0.16.2)

---
updated-dependencies:
- dependency-name: pascalgn/automerge-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Kieran <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Jan 16, 2024
1 parent 41a8e80 commit 25e1ed0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
if: ${{ github.actor != 'dependabot[bot]' }}
steps:
- name: automerge
uses: "pascalgn/automerge-action@v0.15.6"
uses: "pascalgn/automerge-action@v0.16.2"
env:
GITHUB_TOKEN: "${{ secrets.GH_TOKEN }}"
MERGE_METHOD: "squash"
Expand Down

0 comments on commit 25e1ed0

Please sign in to comment.