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.

Sign up for GitHub

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

Jump to bottom

fix(build): use vertx-dependencies and netty-bom for version management #1720

Merged
merged 6 commits into from
Oct 12, 2023
Merged

fix(build): use vertx-dependencies and netty-bom for version management #1720

merged 6 commits into from
Oct 12, 2023

Conversation

andrewazores
Copy link
Member

@andrewazores andrewazores commented Oct 12, 2023 •
edited
Loading

Welcome to Cryostat! 👋

Before contributing, make sure you have:

  • Read the contributing guidelines
  • Linked a relevant issue which this PR resolves
  • Linked any other relevant issues, PR's, or documentation, if any
  • Resolved all conflicts, if any
  • Rebased your branch PR on top of the latest upstream main branch
  • Attached at least one of the following labels to the PR: [chore, ci, docs, feat, fix, test]
  • Signed all commits using a GPG signature

To recreate commits with GPG signature git fetch upstream && git rebase --force --gpg-sign upstream/main

Fixes: #1719

@github-actions
Copy link
Contributor

Hi @andrewazores! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

@github-actions github-actions bot added the needs-triage Needs thorough attention from code reviewers label Oct 12, 2023
@mergify mergify bot added the safe-to-test label Oct 12, 2023
@github-actions
Copy link
Contributor

Hi @andrewazores! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

1 similar comment
@github-actions
Copy link
Contributor

Hi @andrewazores! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

@github-actions
Copy link
Contributor

Hi @andrewazores! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

@andrewazores andrewazores added build fix dependencies Pull requests that update a dependency file and removed needs-triage Needs thorough attention from code reviewers labels Oct 12, 2023
@andrewazores
Copy link
Member Author

/build_test

@andrewazores
Copy link
Member Author

https://github.com/cryostatio/cryostat/actions/runs/6499846402

@andrewazores andrewazores marked this pull request as ready for review October 12, 2023 19:05
@andrewazores andrewazores changed the title fix(build): use vertx-dependencies as bom for vertx and netty versions fix(build): use vertx-dependencies and netty-bom for version management Oct 12, 2023
@andrewazores
Copy link
Member Author

/build_test

@andrewazores
Copy link
Member Author

https://github.com/cryostatio/cryostat/actions/runs/6499944177

@andrewazores
Copy link
Member Author

andrewazores commented Oct 12, 2023 •
edited
Loading

We still end up with two separate properties for the vertx and netty versions that should generally be kept in sync, but at least this way they are properly managed and will ensure that all of the netty components use matching versions, including the ones we get transitively via vertx.

I think ideally we could just not specify anything for the netty version and fall back to whatever vertx defines, only explicitly providing a netty version if we want to force an override, but this is probably good enough and better than it was.

@andrewazores andrewazores mentioned this pull request Oct 12, 2023
Closed
@github-actions
Copy link
Contributor

ARCH IMAGE
amd64 ghcr.io/cryostatio/cryostat:pr-1720-f7705890af836745cb5480b40af233cc6cffd3d5-linux-amd64
arm64 ghcr.io/cryostatio/cryostat:pr-1720-f7705890af836745cb5480b40af233cc6cffd3d5-linux-arm64

To run smoketest:

# amd64          
CRYOSTAT_IMAGE=ghcr.io/cryostatio/cryostat:pr-1720-f7705890af836745cb5480b40af233cc6cffd3d5-linux-amd64 sh smoketest.sh

# or arm64
CRYOSTAT_IMAGE=ghcr.io/cryostatio/cryostat:pr-1720-f7705890af836745cb5480b40af233cc6cffd3d5-linux-arm64 sh smoketest.sh

@andrewazores andrewazores merged commit c1da58d into cryostatio:main Oct 12, 2023
14 checks passed
@andrewazores andrewazores deleted the netty-bom branch October 12, 2023 19:53
mergify bot pushed a commit that referenced this pull request Oct 12, 2023
@andrewazores @mergify
fix(build): use vertx-dependencies and netty-bom for version manageme…
5f85c5c 
…nt (#1720)

(cherry picked from commit c1da58d)
@mergify mergify bot mentioned this pull request Oct 12, 2023
Merged
ebaron pushed a commit that referenced this pull request Oct 12, 2023
@mergify @andrewazores
fix(build): use vertx-dependencies and netty-bom for version manageme…
1b2abeb 
…nt (#1720) (#1721)

(cherry picked from commit c1da58d)

Co-authored-by: Andrew Azores <aazores@redhat.com>
This was referenced Oct 24, 2023
Merged
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ebaron ebaron ebaron approved these changes

Assignees
No one assigned
Labels
backport build dependencies Pull requests that update a dependency file fix safe-to-test
Projects
No open projects
2.4.0 release
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug] pom.xml explicitly specifies netty version to match vertx version
2 participants
@andrewazores @ebaron