disabled automerge in pipelines because it's not allowed in repo sett…

…ings (#633)
VictoriaMetrics · Aug 30, 2023 · e3b0f05 · e3b0f05
1 parent a50e4e6
commit e3b0f05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -129,7 +129,6 @@ jobs:
           git commit -S -m "Automatic update CHANGELOGs and READMEs"
           git push origin ${VM_GIT_BRANCH_NAME}
           gh pr create -f
-          gh pr merge ${VM_GIT_BRANCH_NAME} --auto --squash --delete-branch
         env:
           GH_TOKEN: "${{ secrets.VM_BOT_GH_TOKEN }}"
           GITHUB_TOKEN: "${{ secrets.VM_BOT_GH_TOKEN }}"
diff --git a/.github/workflows/update-docs.yaml b/.github/workflows/update-docs.yaml
@@ -60,8 +60,7 @@ jobs:
           git add charts/*/README.md
           git commit -S -m "Synchronize docs"
           git push origin ${VM_GIT_BRANCH_NAME}
-          gh pr create -f
-          gh pr merge ${VM_GIT_BRANCH_NAME} --auto --squash --delete-branch
+          gh pr create -f --base gh-pages
         env:
           GH_TOKEN: "${{ secrets.VM_BOT_GH_TOKEN }}"
-          GITHUB_TOKEN: "${{ secrets.VM_BOT_GH_TOKEN }}"
+          GITHUB_TOKEN: "${{ secrets.VM_BOT_GH_TOKEN }}"