Skip to content

Commit

Permalink
Merge branch 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
v-bilous committed Jul 7, 2023
2 parents 382bd4e + 70ebc00 commit 2767b11
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 1 deletion.
14 changes: 14 additions & 0 deletions .github/workflows/dependabot-autoapprove.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Auto approve

on: pull_request_target

jobs:
auto-approve:
runs-on: ubuntu-latest
permissions:
pull-requests: write
if: github.actor == 'dependabot[bot]'
steps:
- uses: hmarr/auto-approve-action@da92209ac68d76fd20af3efa5268a5e8fafb91d9
with:
github-token: ${{secrets.GITHUB_TOKEN}}
24 changes: 24 additions & 0 deletions .github/workflows/dependabot-automerge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Dependabot auto-merge
# From: https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#enable-auto-merge-on-a-pull-request
on: pull_request

permissions:
contents: write
pull-requests: write

jobs:
dependabot:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1.1.1
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' }}
run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<version.org.jdbi>3.39.1</version.org.jdbi>
<version.org.json>20230618</version.org.json>
<version.org.jsonschema2pojo>1.2.1</version.org.jsonschema2pojo>
<version.org.keycloak>21.1.1</version.org.keycloak>
<version.org.keycloak>21.1.2</version.org.keycloak>
<version.mysql>8.0.22</version.mysql>
<version.org.postgresql>42.2.20</version.org.postgresql>
<version.org.slf4j>2.0.7</version.org.slf4j>
Expand Down

0 comments on commit 2767b11

Please sign in to comment.