From 273ae1203165a0a4d0ee0e014e1e360385457d1f Mon Sep 17 00:00:00 2001 From: Isaac Milarsky Date: Tue, 20 Feb 2024 14:34:07 -0600 Subject: [PATCH] fix script lacking github actions user name Signed-off-by: Isaac Milarsky --- .github/workflows/auto_merge.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/auto_merge.yml b/.github/workflows/auto_merge.yml index 3840abe95a..ec4c5c3d74 100644 --- a/.github/workflows/auto_merge.yml +++ b/.github/workflows/auto_merge.yml @@ -15,8 +15,14 @@ jobs: with: fetch-depth: 0 - run: | + git config user.name 'GitHub Actions' + git config user.email 'actions@users.noreply.github.com' git checkout dev git merge main + git add -A + timestamp=$(date -u) + git commit -m "update dev: ${timestamp}" + echo "Done with merge" - name: Push to dev uses: CasperWA/push-protected@v2 with: