Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .ci/updatecli/updatecli-bump-stack-version.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# update-cli configuration for automated go updates
---
name: Bump ESS snapshots

Expand Down Expand Up @@ -40,7 +39,7 @@ actions:
scmid: githubConfig
sourceid: lastStableStackSnapshot
spec:
automerge: true
automerge: false
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We cannot use automerge here, the branch protections have a higher precedence and the GitHub Actions [bot] does not support it yet, see https://github.com/orgs/community/discussions/13836.

Pull Request available at:

	https://github.com/elastic/elastic-agent/pull/8576

ERROR: action stage:	"Merge method merge commits are not allowed on this repository and Pull request User is not authorized for this protected branch"
Existing GitHub pull request found: https://github.com/elastic/elastic-agent/pull/8576
ERROR: running actions:
errors occurred while running actions:
	* Merge method merge commits are not allowed on this repository and Pull request User is not authorized for this protected branch

=============================

labels:
- dependencies
- backport-skip
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/bump-stable-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ jobs:
- id: generator
uses: elastic/oblt-actions/elastic/active-branches@v1
with:
# Remove exclusions when backports are merged
exclude-branches: "8.17,8.18,8.19,9.0"
filter-branches: true

update-stable-snapshot:
Expand Down