From aa64b542c4a51d99496da33a421fe83185abd100 Mon Sep 17 00:00:00 2001 From: Nicholas Gates Date: Thu, 6 Jun 2024 10:41:06 -0400 Subject: [PATCH] build: QPPA-0000 ensure develop branch is checked out in publish action p5 --- .github/workflows/publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7a3c0b53..0685a0d0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -76,6 +76,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.ACTIONS_NICHOLAS_PAT }} run: | + git config user.name "GitHub actions" + git config user.email noreply@github.com git fetch origin master:master git checkout master git merge --no-ff develop -m "Merging develop into master via GitHub Action"