chore: fix release automation for patch releases

divnix · Jun 15, 2023 · 7d353de · 7d353de
1 parent 6d9499f
commit 7d353de
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cells/_automation/configs.nix b/cells/_automation/configs.nix
@@ -14,7 +14,7 @@ in {
       branch_whitelist = ["main" "release/**"];
       ignore_merge_commits = true;
       pre_bump_hooks = [
-        ''git switch -c "$(echo "release/{{version}}" | sed 's/\.[^.]*$//')" || git switch "$(echo "release/{{version}}" | sed 's/\.[^.]*$//')"''
+        ''git switch -c "$(echo "release/{{version}}" | sed 's/\.[^.]*$//')" || git switch "$(echo "release/{{version}}" | sed 's/\.[^.]*$//')" && git merge main''
         "echo {{version}} > ./VERSION"
       ];
       post_bump_hooks = [