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

bump npcap version to 1.76 #315

Merged
merged 3 commits into from
Sep 22, 2023
Merged

bump npcap version to 1.76 #315

merged 3 commits into from
Sep 22, 2023

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Sep 10, 2023

This bumps the version of the Npcap OEM installer to v1.76. The artifact has been placed in the private store.

Please take a look.

Query: What backports will be required for this change?

For elastic/beats#36539

@efd6 efd6 self-assigned this Sep 10, 2023
@efd6 efd6 requested a review from v1v September 10, 2023 22:46
@mergify
Copy link

mergify bot commented Sep 10, 2023

This pull request does not have a backport label. Could you fix it @efd6? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d is the label to automatically backport to the 1./d branch. /d is the digit
    NOTE: backport-skip has been added to this pull request.

@elasticmachine
Copy link

elasticmachine commented Sep 10, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-09-22T12:22:44.537+0000

  • Duration: 49 min 36 sec

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@efd6
Copy link
Contributor Author

efd6 commented Sep 10, 2023

Test failure appears to be unrelated.

@v1v
Copy link
Member

v1v commented Sep 11, 2023

These failures are not related to this PR but it cannot be merged until they are resolved. #311 contains a bit of context.

@v1v
Copy link
Member

v1v commented Sep 11, 2023

Query: What backports will be required for this change?

It depends on the consumers. Golang-crossbuild follows the Golang versioning, only one minor version is supported. For instance, 1.21.1 is the latest so 1.20 is the last supported minor.

@v1v
Copy link
Member

v1v commented Sep 18, 2023

Query: What backports will be required for this change?

If you need this change in an existing Golang version, then it might be required to create a new branch following the naming <x>.<y>.<z>.X for instance https://github.com/elastic/golang-crossbuild/tree/1.17.5.x is the one that changed the golang-crossbuild version 1.17.5

And then backport the change using @mergifyio backport x.y.z.X , so when merged the new docker images will be in place containing the new changes

@efd6
Copy link
Contributor Author

efd6 commented Sep 19, 2023

OK, thanks. This will only be for children of beats main (with no backports), which is at go1.20.8, so no backport other that go1.20 will be needed.

@efd6 efd6 enabled auto-merge (squash) September 19, 2023 00:25
@efd6
Copy link
Contributor Author

efd6 commented Sep 19, 2023

@alexsapran and @pazone Would you mind taking a look please.

@v1v
Copy link
Member

v1v commented Sep 20, 2023

OK, thanks. This will only be for children of beats main (with no backports), which is at go1.20.8, so no backport other that go1.20 will be needed.

I'm afraid I didn't explain this correctly. golang-crossbuild:1.20.8 has been already released. Hence it cannot be changed unless using the above-mentioned branch strategy.

If this PR is merged and backported to 1.20 then this change won't be available until 1.20.9. Then, Beats will need to use that version or above.

If you need this change to be in golang-crossbuild:1.20.8 then, it's required to branch off 1.20.8.x and backport this change so the docker images for golang-crossbuild:1.20.8 can be recreated.

NOTE: this is the reason we created https://github.com/elastic/golang-crossbuild/tree/1.17.5.x , so #148 could be available in 1.17.5

I understand, this is a corner case ,that we have not needed in the past, but with ncap we came up with this strategy.

@efd6
Copy link
Contributor Author

efd6 commented Sep 20, 2023

OK. That's a lot of rigmarole. I'll see what I can do.

@v1v v1v mentioned this pull request Sep 20, 2023
@v1v
Copy link
Member

v1v commented Sep 20, 2023

OK. That's a lot of rigmarole. I'll see what I can do.

Thanks for trying to understand my writing! To help with, let me ask you this:

  • do you need this change in 1.20.8.
  • O can you wait for 1.20.9 or 1.21.2?

If the former, then we need all that craziness. If the latter, then there is a need to request the Beats team to use 1.20.9 or 1.21.2 when golang-crossbuild provides those versions (likely in 3 weeks or so)

@efd6
Copy link
Contributor Author

efd6 commented Sep 20, 2023

I don't know what the time frame for a go1.20.9 is (Beats doesn't build with go1.21 yet). I guess it is likely to be before 8.11, so we could wait. It's not a wildly friendly system though.

@v1v
Copy link
Member

v1v commented Sep 20, 2023

I guess it is likely to be before 8.11, so we could wait. It's not a wildly friendly system though.

I can happily help with and make some notes so whoever needs to do this in the future can follow them. For doing so, let me know and merge this PR please :)

@efd6
Copy link
Contributor Author

efd6 commented Sep 20, 2023

I'm unable to merge this; it is still waiting for a review from @alexsapran.

@alexsapran
Copy link

I'm unable to merge this; it is still waiting for a review from @alexsapran.

Sorry for that, I saw @pazone gave the 👍🏼 and I thought it was enough.

@efd6 efd6 merged commit 1c5174b into main Sep 22, 2023
1 check passed
@efd6 efd6 deleted the npcap-1.76 branch September 22, 2023 13:11
mergify bot pushed a commit that referenced this pull request Sep 22, 2023
Co-authored-by: Victor Martinez <[email protected]>
(cherry picked from commit 1c5174b)
efd6 added a commit that referenced this pull request Sep 22, 2023
@v1v
Copy link
Member

v1v commented Sep 25, 2023

@Mergifyio backport 1.20.8.x

@mergify
Copy link

mergify bot commented Sep 25, 2023

backport 1.20.8.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Sep 25, 2023
Co-authored-by: Victor Martinez <[email protected]>
(cherry picked from commit 1c5174b)
v1v pushed a commit that referenced this pull request Sep 25, 2023
@efd6 efd6 mentioned this pull request Jan 23, 2024
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.

5 participants