From aca94bb9953314c9c1a82203d7079d383039cfdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?= =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?= =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?= Date: Tue, 21 Feb 2023 19:16:51 +0100 Subject: [PATCH] ci: Merge back released tag to master as Jan (no-changelog) (#5540) --- .github/workflows/release-publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index 466ce2eac..b8b03ab8e 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -50,8 +50,8 @@ jobs: run: | git fetch origin git checkout --track origin/master - git config user.name github-actions - git config user.email github-actions@github.com - git merge --ff origin/${{github.event.pull_request.base.ref}} + git config user.name "Jan Oberhauser" + git config user.email jan.oberhauser@gmail.com + git merge --ff n8n@${{env.RELEASE}} git push origin master git push origin :${{github.event.pull_request.base.ref}}