Skip to content

Build UI as part of the trino-main module#22785

Merged
wendigo merged 4 commits intomasterfrom
serafin/exclude-webapp-src
Jul 26, 2024
Merged

Build UI as part of the trino-main module#22785
wendigo merged 4 commits intomasterfrom
serafin/exclude-webapp-src

Conversation

@wendigo
Copy link
Copy Markdown
Contributor

@wendigo wendigo commented Jul 24, 2024

This removes checked-in dist/ directory.

Instead of keeping commited dist/ directory, it's built from sources using frontend plugin. I've checked that builds in production mode are reproducible. As a consequence I've dropped check_webui.sh as now the tests are executed as part of the trino-main.

@wendigo wendigo changed the title Exclude webapp/src from target jar Build UI as part of the trino-main module Jul 24, 2024
@github-actions github-actions bot added the ui Web UI label Jul 24, 2024
@wendigo wendigo requested a review from mosabua July 24, 2024 11:56
@wendigo wendigo force-pushed the serafin/exclude-webapp-src branch from 5f05570 to ecb252d Compare July 24, 2024 12:03
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe we need to change this to instead verify if the build causes the lock files to change - which suggests something needs checking in.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not super convinced it's necessary.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@electrum thoughts?

@mosabua
Copy link
Copy Markdown
Member

mosabua commented Jul 24, 2024

This is a result of #22765 and our investigation on how to improve this overall.

Copy link
Copy Markdown
Member

@mosabua mosabua left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes all look good to me. In Trino Gateway we had some issues with a similar approach where the ordering of the plugin executions caused the UI to be missing on a build from a clean checkout. Please verify that this is not the case here.

Also .. how do we test the UI since there are a bunch of dependency updates woven into this PR now.

Lastly .. I think it is best practice to check in the lock files as you did .. can you confirm? And also verify it wont cause issues?

@wendigo
Copy link
Copy Markdown
Contributor Author

wendigo commented Jul 24, 2024

@mosabua good feedback. I've added explicit phases to the executions!

@wendigo wendigo force-pushed the serafin/exclude-webapp-src branch from b605916 to e879ba0 Compare July 24, 2024 19:00
@wendigo
Copy link
Copy Markdown
Contributor Author

wendigo commented Jul 24, 2024

@mosabua the dependency updates are around tooling, not the react itself that is used in the UI. I've tested it manually and it seems to work :)

@mosabua
Copy link
Copy Markdown
Member

mosabua commented Jul 24, 2024

@mosabua the dependency updates are around tooling, not the react itself that is used in the UI. I've tested it manually and it seems to work :)

Well.. at least React was updated. Do you know if the dist folder shadowed the declared and transitive dependencies or reverse? In either case .. the fact that you tested it a bit is good to know. Not sure how much more testing we should do .. maybe just merge shortly after the next release and see what comes up in development usage ;-)

Also not sure if we want to add explicit declaration of other dependencies such as vis

@wendigo
Copy link
Copy Markdown
Contributor Author

wendigo commented Jul 24, 2024

@mosabua it was but to a patch version to address a CVE

Copy link
Copy Markdown
Member

@mosabua mosabua left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am good with this now. Timing wise it might be worth merging just after we shipped 453 .. but up to your judgement @wendigo

@wendigo
Copy link
Copy Markdown
Contributor Author

wendigo commented Jul 24, 2024

@mosabua after 453 it is :)

@wendigo wendigo force-pushed the serafin/exclude-webapp-src branch from e879ba0 to 0184075 Compare July 26, 2024 10:26
@wendigo wendigo merged commit 5286bd2 into master Jul 26, 2024
@wendigo wendigo deleted the serafin/exclude-webapp-src branch July 26, 2024 10:27
@wendigo
Copy link
Copy Markdown
Contributor Author

wendigo commented Jul 26, 2024

@mosabua merged

@github-actions github-actions bot added this to the 454 milestone Jul 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Development

Successfully merging this pull request may close these issues.

5 participants