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

build(deps): upgrade to Patternfly 5 #1153

Merged
merged 2 commits into from
Jul 15, 2024
Merged

build(deps): upgrade to Patternfly 5 #1153

merged 2 commits into from
Jul 15, 2024

Conversation

tthvo
Copy link
Member

@tthvo tthvo commented Oct 31, 2023

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


Related to #1110

Description of the change:

WIP

Motivation for the change:

WIP

@tthvo tthvo added dependencies Pull requests that update a dependency file chore Refactor, rename, cleanup, etc. build labels Oct 31, 2023
@github-actions github-actions bot added the needs-triage Needs thorough attention from code reviewers label Oct 31, 2023
@tthvo tthvo removed the needs-triage Needs thorough attention from code reviewers label Oct 31, 2023
@tthvo tthvo force-pushed the pf5 branch 2 times, most recently from 6b66fd9 to 1e98866 Compare November 3, 2023 08:22
@andrewazores
Copy link
Member

@tthvo just a heads up - this repo got forked into https://github.com/cryostatio/cryostat-web-2.x .

This one is the active development one which is linked to the cryostat3 backend.

The new fork is cut from a recent commit, and is the one that will continue on (for a short while) for any working targeting 2.4.x that may come.

This PR is OK to just stay here in this repo, there is no need to backport this to the 2.x fork once it's ready.

@tthvo
Copy link
Member Author

tthvo commented Dec 15, 2023

Ahh thanks for the heads up! I will keep that in mind!

@tthvo
Copy link
Member Author

tthvo commented Jun 5, 2024

Closing this as it is way overdue and potentially merge conflicts. Hey @andrewazores, let's create an upstream pf5 branch like cryostat3 and migrate one by one there?

This PR can serve as a reference to port whichever usable later to upstream branch.

@tthvo tthvo closed this Jun 5, 2024
@andrewazores
Copy link
Member

Yup, I'll be creating upstream release branches (cryostat-v3.0) today or tomorrow, and after that I will create pf5 off of main.

@tthvo
Copy link
Member Author

tthvo commented Jun 5, 2024

Sounds good! Thanks!

@andrewazores
Copy link
Member

https://github.com/cryostatio/cryostat-web/tree/pf5

@andrewazores andrewazores reopened this Jun 6, 2024
@github-actions github-actions bot added the needs-triage Needs thorough attention from code reviewers label Jun 6, 2024
@andrewazores andrewazores changed the base branch from main to pf5 June 6, 2024 18:32
@andrewazores andrewazores removed the needs-triage Needs thorough attention from code reviewers label Jun 6, 2024
@andrewazores
Copy link
Member

Merge conflicts are probably just text updates from #1260

@andrewazores
Copy link
Member

@tthvo if you can resolve these merge conflicts, we can get this merged into the upstream feature branch so that the work can continue there. Once that branch diverges from main we can create a draft PR to track its progress and also keep it up to date with main more easily.

@tthvo
Copy link
Member Author

tthvo commented Jun 6, 2024

okay, sounds good! I will have a look at the end of this week!

@tthvo tthvo marked this pull request as ready for review June 7, 2024 08:26
@tthvo tthvo requested a review from a team as a code owner June 7, 2024 08:26
@tthvo tthvo requested a review from a team June 7, 2024 08:26
@tthvo
Copy link
Member Author

tthvo commented Jun 7, 2024

Merge conflicts are resolved now. Lots of things and tests are still broken but building web assets with webpack is good (i.e. yarn build:notests and yarn start:dev should all work).

@mergify mergify bot mentioned this pull request Jul 9, 2024
7 tasks
@andrewazores
Copy link
Member

Merging this into the upstream feature branch now.

@andrewazores andrewazores merged commit ce0ac3f into cryostatio:pf5 Jul 15, 2024
22 of 23 checks passed
andrewazores added a commit that referenced this pull request Jul 15, 2024
@tthvo tthvo deleted the pf5 branch July 15, 2024 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build chore Refactor, rename, cleanup, etc. dependencies Pull requests that update a dependency file
Projects
Status: Done
Status: In Progress
Development

Successfully merging this pull request may close these issues.

[Epic] Upgrade to Patternfly v5
3 participants