Skip to content

Commit e3b0f05

Browse files
authored
disabled automerge in pipelines because it's not allowed in repo settings (#633)
1 parent a50e4e6 commit e3b0f05

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.github/workflows/release.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ jobs:
129129
git commit -S -m "Automatic update CHANGELOGs and READMEs"
130130
git push origin ${VM_GIT_BRANCH_NAME}
131131
gh pr create -f
132-
gh pr merge ${VM_GIT_BRANCH_NAME} --auto --squash --delete-branch
133132
env:
134133
GH_TOKEN: "${{ secrets.VM_BOT_GH_TOKEN }}"
135134
GITHUB_TOKEN: "${{ secrets.VM_BOT_GH_TOKEN }}"

.github/workflows/update-docs.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ jobs:
6060
git add charts/*/README.md
6161
git commit -S -m "Synchronize docs"
6262
git push origin ${VM_GIT_BRANCH_NAME}
63-
gh pr create -f
64-
gh pr merge ${VM_GIT_BRANCH_NAME} --auto --squash --delete-branch
63+
gh pr create -f --base gh-pages
6564
env:
6665
GH_TOKEN: "${{ secrets.VM_BOT_GH_TOKEN }}"
67-
GITHUB_TOKEN: "${{ secrets.VM_BOT_GH_TOKEN }}"
66+
GITHUB_TOKEN: "${{ secrets.VM_BOT_GH_TOKEN }}"

0 commit comments

Comments
 (0)