From 565377b4203c79ebba6fe791672cd4676cd51977 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 6 Sep 2024 13:40:22 +0200 Subject: [PATCH] feat: enable the auto-merge feature on dependabot prs - so we only have to approve them - enables the github feature auto-merge - only add this if tests pass Signed-off-by: Robert Waffen --- .github/workflows/ci.yaml | 21 +++++++++++++++++++++ puppetserver/Dockerfile | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 648241a1..e636e694 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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/fetch-metadata@v2.2.0 + 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}} diff --git a/puppetserver/Dockerfile b/puppetserver/Dockerfile index b9940bf0..df76a697 100644 --- a/puppetserver/Dockerfile +++ b/puppetserver/Dockerfile @@ -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 " \ +LABEL org.label-schema.maintainer="Voxpupuli Team " \ org.label-schema.vendor="Voxpupuli" \ org.label-schema.url="https://github.com/voxpupuli/container-puppetserver" \ org.label-schema.license="Apache-2.0" \