diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 080f4510..bb16a0e8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -74,3 +74,22 @@ jobs: name: Test suite steps: - run: echo Test suite completed + + dependabot: + 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/test/test_helper.rb b/test/test_helper.rb index fe65116d..037c55ce 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -11,6 +11,7 @@ require_relative "support/fake_puppet_db" require_relative "support/openapi" require_relative "support/sign_in_helper" +require 'rackup' # Start FakePuppetDB-Server server_thread = Thread.new do