chore: fix dev -> master on release

Koenkk · Feb 1, 2024 · fdc9f7d · fdc9f7d
1 parent 06b3395
commit fdc9f7d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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