Skip to content

Commit

Permalink
Merge pull request #119 from voxpupuli/enable_automerge
Browse files Browse the repository at this point in the history
    feat: enable the auto-merge feature on dependabot prs
  • Loading branch information
rwaffen authored Sep 6, 2024
2 parents 24c9a2e + 565377b commit 7a4fe7f
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
21 changes: 21 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,24 @@ jobs:
name: Test suite
steps:
- run: echo Test suite completed

dependabot:
permissions:
contents: write
name: 'Dependabot auto-merge'
needs:
- tests
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' && github.event_name == 'pull_request'}}
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/[email protected]
with:
github-token: '${{ secrets.GITHUB_TOKEN }}'

- name: Enable auto-merge for Dependabot PRs
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
2 changes: 1 addition & 1 deletion puppetserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ARG BUILD_PKGS="ruby3.0-dev gcc make cmake pkg-config libssl-dev libc6-dev"
ARG DUMB_INIT_VERSION="1.2.5"
ARG TARGETARCH

LABEL org.label-schema.maintainer="Voxpupuli Team <info@voxpupuli.org>" \
LABEL org.label-schema.maintainer="Voxpupuli Team <voxpupuli@groups.io>" \
org.label-schema.vendor="Voxpupuli" \
org.label-schema.url="https://github.com/voxpupuli/container-puppetserver" \
org.label-schema.license="Apache-2.0" \
Expand Down

0 comments on commit 7a4fe7f

Please sign in to comment.