From fdc9f7d4d4be460290d69146622a13745ae39f06 Mon Sep 17 00:00:00 2001 From: koenkk Date: Thu, 1 Feb 2024 21:57:56 +0100 Subject: [PATCH] chore: fix dev -> master on release --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35453fc503..9b554259df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,9 +96,10 @@ jobs: TAG=${GITHUB_REF#refs/*/} git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" + git fetch --unshallow git fetch origin git checkout master - git merge -m 'chore: merge dev to master' origin/dev + git merge --ff-only origin/dev git push origin master git checkout dev jq ".version = \"$TAG-dev\"" package.json > package.json.tmp