Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,20 +203,6 @@ jobs:
$MAVEN ${MAVEN_TEST} -T 1C clean verify -DskipTests -Dair.check.skip-all=true ${MAVEN_GIB} -Dgib.buildUpstream=never -P errorprone-compiler \
-pl '!:trino-docs,!:trino-server,!:trino-server-rpm'

web-ui-checks:
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?

runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # checkout all commits: it's not needed here, but it's needed almost always, so let's do this for completeness
ref: |
${{ github.event_name == 'repository_dispatch' &&
github.event.client_payload.pull_request.head.sha == github.event.client_payload.slash_command.args.named.sha &&
format('refs/pull/{0}/head', github.event.client_payload.pull_request.number) || '' }}
- name: Web UI Checks
run: core/trino-main/bin/check_webui.sh

test-jdbc-compatibility:
runs-on: ubuntu-latest
timeout-minutes: 30
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ product-test-reports
.github/test-pt-matrix.yaml
.github/bin/redshift/.cluster-identifier
**/dependency-reduced-pom.xml
core/trino-main/src/main/resources/webapp/dist/
43 changes: 0 additions & 43 deletions core/trino-main/bin/check_webui.sh

This file was deleted.

57 changes: 57 additions & 0 deletions core/trino-main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -537,8 +537,65 @@
<directory>src/main/resources</directory>
<excludes>
<exclude>**/node_modules/**</exclude>
<exclude>**/webapp/src/**</exclude>
<exclude>**/webapp/dist/node/**</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<executions>
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<workingDirectory>src/main/resources/webapp/src</workingDirectory>
<installDirectory>src/main/resources/webapp/dist</installDirectory>
</configuration>
</execution>
<execution>
<id>install dependencies</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>install</arguments>
<workingDirectory>src/main/resources/webapp/src</workingDirectory>
<installDirectory>src/main/resources/webapp/dist</installDirectory>
</configuration>
</execution>
<execution>
<id>package webui</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>run package</arguments>
<workingDirectory>src/main/resources/webapp/src</workingDirectory>
<installDirectory>src/main/resources/webapp/dist</installDirectory>
</configuration>
</execution>
<execution>
<id>flow check</id>
<goals>
<goal>npm</goal>
</goals>
<phase>verify</phase>
<configuration>
<arguments>run flow</arguments>
<workingDirectory>src/main/resources/webapp/src</workingDirectory>
<installDirectory>src/main/resources/webapp/dist</installDirectory>
Comment thread
wendigo marked this conversation as resolved.
Outdated
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 0 additions & 2 deletions core/trino-main/src/main/resources/webapp/.gitattributes

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions core/trino-main/src/main/resources/webapp/dist/index.js

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions core/trino-main/src/main/resources/webapp/dist/plan.js

This file was deleted.

64 changes: 0 additions & 64 deletions core/trino-main/src/main/resources/webapp/dist/plan.js.LICENSE.txt

This file was deleted.

2 changes: 0 additions & 2 deletions core/trino-main/src/main/resources/webapp/dist/query.js

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions core/trino-main/src/main/resources/webapp/dist/stage.js

This file was deleted.

Loading