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

[1.20](backport #378) Bump npcap version to 1.79 #380

Merged
merged 2 commits into from
Feb 7, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 24, 2024

This is an automatic backport of pull request #378 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 43f2c42)
@mergify mergify bot added the backport label Jan 24, 2024
@andrewkroh andrewkroh closed this Jan 24, 2024
@mergify mergify bot deleted the mergify/bp/1.20/pr-378 branch January 24, 2024 21:49
@v1v v1v restored the mergify/bp/1.20/pr-378 branch January 25, 2024 08:23
@v1v v1v reopened this Jan 25, 2024
@v1v
Copy link
Member

v1v commented Jan 25, 2024

This backport is needed if 1.20 is still an active branch

@andrewkroh
Copy link
Member

andrewkroh commented Jan 25, 2024

This backport is needed if 1.20 is still an active branch

Then do I also need the 1.20.13.x branch that I created from 1.20 and opened a backport PR into? 😕

@v1v
Copy link
Member

v1v commented Jan 25, 2024

Then do I also need the 1.20.13.x branch that I created from 1.20 and opened a #379 into? 😕

Yes

A bit of context, the main branch represents the latest minor Golang version, and 1.20 branch, in this particular case, represents the previous latest minor golang version.

We always support the last two Golang minor versions.

If a change goes to main, it most likely needs to be backported to 1.20 - that's the default behaviour

Regarding ncap since it's used in elastic/beats, in addition to the above-menitioned steps there is an extra one if the Golang version used in elastic/beats cannot be bumped.

For such, you need to get the golang version from https://github.com/elastic/beats/blob/main/.go-version or https://github.com/elastic/beats/blob/8.12/.go-version and then create the branch major.minor.patch.x from major.minor.patch in this repository, and finally there should be a backport with the ncap update also to the new major.minor.patch.x branch.

That's the only option to recreate the golang-crossbuild release major.minor.patch that has been already published to then update the ncap accordingly.

Unfortunately, when we built this ncap approach, we had to use docker images that were not publicly available, but the ncap release and golang release were not aligned... that's the reason for using major.minor.patch.x branches... to be able to update an existing golang-crossbuild release.

Therefore, if ncap needs to be updated, then you will need:

  1. Change in main
  2. Backport in Golang version - 1
  3. Create major.minor.patch.x branch from major.minor.patch
  4. Backport in major.minor.patch.x

Copy link
Author

mergify bot commented Jan 29, 2024

This pull request has not been merged yet. Could you please review and merge it @andrewkroh? 🙏

1 similar comment
Copy link
Author

mergify bot commented Feb 5, 2024

This pull request has not been merged yet. Could you please review and merge it @andrewkroh? 🙏

@elasticmachine
Copy link

💚 Build Succeeded

History

cc @andrewkroh

@elasticmachine
Copy link

💚 Build Succeeded

History

cc @andrewkroh

@andrewkroh
Copy link
Member

Needs review.

@elasticmachine
Copy link

💚 Build Succeeded

History

cc @andrewkroh

@v1v
Copy link
Member

v1v commented Feb 6, 2024

@andrewkroh, you can review it and I guess the enable auto-merge will do the rest

@andrewkroh andrewkroh merged commit 25d6300 into 1.20 Feb 7, 2024
10 checks passed
@andrewkroh andrewkroh deleted the mergify/bp/1.20/pr-378 branch February 7, 2024 01:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants