fix: force checkout from main (#4554)

elastic · Nov 22, 2024 · dcbbb27 · dcbbb27
1 parent 06c98ce
commit dcbbb27
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/Makefile b/.github/Makefile
@@ -38,9 +38,9 @@ create-next-release: prepare-next-release create-prs-next-release
 .PHONY: update-labels
 update-labels:
 	echo '  - name: backport patches to $(PROJECT_MAJOR_VERSION).$(PROJECT_MINOR_VERSION) branch' >> ../.mergify.yml
-	echo '    conditions:'                                                          >> ../.mergify.yml
-	echo '      - merged'                                                           >> ../.mergify.yml
-	echo '      - label=backport-$(PROJECT_MAJOR_VERSION).$(PROJECT_MINOR_VERSION)' >> ../.mergify.yml
+	echo '    conditions:'                                                          >>  ../.mergify.yml
+	echo '      - merged'                                                           >>  ../.mergify.yml
+	echo '      - label=backport-$(PROJECT_MAJOR_VERSION).$(PROJECT_MINOR_VERSION)' >>  ../.mergify.yml
 	echo '    actions:'                                                            	>>	../.mergify.yml
 	echo '      backport:'                                                          >>	../.mergify.yml
 	echo '        assignees:'                                                       >>	../.mergify.yml
@@ -69,7 +69,7 @@ create-branch-major-minor-release:
 .PHONY: prepare-next-release
 prepare-next-release:
 	git checkout main
-	git checkout -b $(BACKPORT_BRANCH_NAME)
+	git checkout -b $(BACKPORT_BRANCH_NAME) main
 	$(MAKE) update-labels
 	$(MAKE) git-diff
 	if [ ! -z "$$(git status -s)" ]; then \