Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🔥 Cleanup auto merge #196

Merged
merged 1 commit into from
Nov 9, 2023
Merged

🔥 Cleanup auto merge #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions .github/workflows/template_automerge_dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,20 @@ on:
workflow_call:
secrets:
app_id:
required: false
required: true
private_key:
required: false
required: true

jobs:
dependabot:

name: auto-merge
runs-on: ubuntu-22.04
if: github.actor == 'dependabot[bot]'

env:
USING_APP_CREDENTIALS: ${{ secrets.app_id != '' && secrets.private_key != '' }}
if: github.actor == 'dependabot[bot]'

steps:
- name: Get App Token
if: ${{ env.USING_APP_CREDENTIALS == 'true' }}
uses: tibdex/[email protected]
id: get_token
with:
Expand All @@ -32,7 +29,7 @@ jobs:
id: metadata
uses: dependabot/fetch-metadata@v1
with:
github-token: ${{ env.USING_APP_CREDENTIALS == 'true' && steps.get_token.outputs.token || secrets.GITHUB_TOKEN }}
github-token: ${{ steps.get_token.outputs.token }}

- name: Enable auto-merge for Dependabot PRs
if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
Expand All @@ -41,4 +38,4 @@ jobs:
gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GITHUB_TOKEN: ${{ env.USING_APP_CREDENTIALS == 'true' && steps.get_token.outputs.token || secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
22 changes: 2 additions & 20 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,6 @@ In this section you can find examples of how to use template workflows. For more
<summary>The action can be used to auto-merge a dependabot PR with minor and patch updates.</summary>

The action is called by creating a PR. It is necessary that the repository is enabled for auto-merge.
There are two possibilities to enable the action.
First, you can use the general GitHub token but the actions does not run on the default branch.

```yml
name: Enable Dependabot Auto-Merge

on: pull_request

permissions:
contents: write
pull-requests: write

jobs:
dependabot:
uses: Staffbase/gha-workflows/.github/workflows/[email protected]
```

Or you can use a specific GitHub app id and private key to generate a new token which can be used for the action.

```yml
name: Enable Dependabot Auto-Merge
Expand All @@ -57,9 +39,9 @@ jobs:
dependabot:
uses: Staffbase/gha-workflows/.github/workflows/[email protected]
secrets:
# optional: identifier of the GitHub App for authentication
# identifier of the GitHub App for authentication
app_id: ${{ <your-app-id> }}
# optional: private key of the GitHub App
# private key of the GitHub App
private_key: ${{ <your-private-key> }}
```

Expand Down