Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updatecli: set force to false, it won't try to update the base branch #6705

Merged
merged 1 commit into from
Feb 5, 2025

Conversation

v1v
Copy link
Member

@v1v v1v commented Feb 4, 2025

What does this PR do?

Set force to false, it won't try to update the base branch

Why is it important?

See updatecli/updatecli#2211 (comment)

We have seen some commits were wiped out, even though they were there originally:

Hence a follow-up was created partially:

Taht should not happen but I see in the logs

WARNING: branch "refs/heads/updatecli_main_901223529a6beca5c9cb3180f1dae9731c8da4e9c40169d7042cc0163a6d7e24" diverged from "refs/heads/main", resetting it to "refs/heads/main"
".go-version" updated with content "1.22.11"
--- .go-version
+++ .go-version
@@ -1 +1 @@
-1.22.10
+1.22.11

when using

Application:	0.91.0
Golang     :	1.23.4 linux/amd64
Build Time :	2024-12-24T06:53:18Z

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

in the CI, I ran https://github.com/elastic/elastic-agent/actions/runs/13142093773/job/36671485235

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

@v1v v1v requested a review from a team as a code owner February 4, 2025 18:13
@mergify mergify bot assigned v1v Feb 4, 2025
@v1v v1v merged commit 32708db into main Feb 5, 2025
10 of 12 checks passed
@v1v v1v deleted the feature/updatecli-avoid-force branch February 5, 2025 13:35
blakerouse pushed a commit to blakerouse/elastic-agent that referenced this pull request Feb 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants