From 5b648d5f145ce248df6c9948eb2745736cef7bef Mon Sep 17 00:00:00 2001 From: Network Service Mesh Bot <60070799+nsmbot@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:39:16 -0600 Subject: [PATCH] Sync files with networkservicemesh/cmd-template (#556) This PR syncs files with https://github.com/networkservicemesh/cmd-template Revision: https://github.com/networkservicemesh/cmd-template/commits/d25aead01d02459c40f7c073b86440351a9fcdaf commit d25aead01d02459c40f7c073b86440351a9fcdaf Author: Nikita Skrynnik <93182827+NikitaSkrynnik@users.noreply.github.com> Date: Wed Nov 9 16:23:14 2022 +0700 add token to automerge workflow (#108) Signed-off-by: Nikita Skrynnik Signed-off-by: Nikita Skrynnik Signed-off-by: NSMBot Signed-off-by: NSMBot Co-authored-by: NSMBot --- .github/workflows/automerge.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/automerge.yaml b/.github/workflows/automerge.yaml index 29f554f..c40519d 100644 --- a/.github/workflows/automerge.yaml +++ b/.github/workflows/automerge.yaml @@ -23,6 +23,8 @@ jobs: needs: [check-mergeability] if: ${{ needs.check-mergeability.result == 'success' }} uses: networkservicemesh/.github/.github/workflows/automerge.yaml@main + secrets: + token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} resolve_conflicts: needs: [check-mergeability]