diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index c58b887..7f4fbb3 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -9,7 +9,7 @@ permissions: jobs: automerge: runs-on: ubuntu-latest - if: github.actor == 'dependabot[bot]' + if: github.actor == 'dependabot[bot]' || (github.event.pull_request.user.id == github.repository.owner.id && github.event.pull_request.title == 'Update flake.lock' steps: - name: Enable Pull Request Automerge run: gh pr merge --squash --auto --repo "${{ github.repository }}" "${{ github.event.pull_request.number }}" diff --git a/.github/workflows/flake_update.yml b/.github/workflows/flake_update.yml index e853335..15b6007 100644 --- a/.github/workflows/flake_update.yml +++ b/.github/workflows/flake_update.yml @@ -32,3 +32,6 @@ jobs: ``` {{ env.GIT_COMMIT_MESSAGE }} ``` + token: ${{ secrets.GH_PAT }} + sign-commits: true + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}