Skip to content

Commit 9e9ef71

Browse files
committed
fix(trino): Disable checking of trino-web-ui
1 parent c05fde3 commit 9e9ef71

File tree

3 files changed

+89
-1
lines changed

3 files changed

+89
-1
lines changed

trino/trino/stackable/patches/470/0001-Add-CycloneDX-plugin.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin
88
1 file changed, 18 insertions(+)
99

1010
diff --git a/pom.xml b/pom.xml
11-
index a1604d5ebec..3f9f7945046 100644
11+
index a1604d5ebe..3f9f794504 100644
1212
--- a/pom.xml
1313
+++ b/pom.xml
1414
@@ -2814,6 +2814,24 @@
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
From 1ec0bcdafe9f74f37b6e791e3df6b552ba748538 Mon Sep 17 00:00:00 2001
2+
From: dervoeti <[email protected]>
3+
Date: Wed, 18 Jun 2025 15:22:49 +0200
4+
Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86
5+
systems requires glibc 2.35, as of 2025-06-18 our UBI image comes with glibc
6+
2.34. This patch can likely be removed once we ship a newer version of glibc.
7+
8+
---
9+
core/trino-web-ui/pom.xml | 22 ----------------------
10+
1 file changed, 22 deletions(-)
11+
12+
diff --git a/core/trino-web-ui/pom.xml b/core/trino-web-ui/pom.xml
13+
index d097a1e22f..98c7516af1 100644
14+
--- a/core/trino-web-ui/pom.xml
15+
+++ b/core/trino-web-ui/pom.xml
16+
@@ -103,28 +103,6 @@
17+
<workingDirectory>src/main/resources/webapp/src</workingDirectory>
18+
</configuration>
19+
</execution>
20+
- <execution>
21+
- <id>check (webapp)</id>
22+
- <goals>
23+
- <goal>npm</goal>
24+
- </goals>
25+
- <phase>verify</phase>
26+
- <configuration>
27+
- <arguments>run ${frontend.check.goal}</arguments>
28+
- <workingDirectory>src/main/resources/webapp/src</workingDirectory>
29+
- </configuration>
30+
- </execution>
31+
- <execution>
32+
- <id>check (webapp-preview)</id>
33+
- <goals>
34+
- <goal>npm</goal>
35+
- </goals>
36+
- <phase>verify</phase>
37+
- <configuration>
38+
- <arguments>run ${frontend.check.goal}</arguments>
39+
- <workingDirectory>src/main/resources/webapp-preview</workingDirectory>
40+
- </configuration>
41+
- </execution>
42+
<execution>
43+
<id>package (webapp-preview)</id>
44+
<goals>
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
From c69033a355820753a49772be984b9c735ce8b92d Mon Sep 17 00:00:00 2001
2+
From: dervoeti <[email protected]>
3+
Date: Wed, 18 Jun 2025 14:05:10 +0200
4+
Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86
5+
systems requires glibc 2.35, as of 2025-06-18 our UBI image comes with glibc
6+
2.34. This patch can likely be removed once we ship a newer version of glibc.
7+
8+
---
9+
core/trino-web-ui/pom.xml | 22 ----------------------
10+
1 file changed, 22 deletions(-)
11+
12+
diff --git a/core/trino-web-ui/pom.xml b/core/trino-web-ui/pom.xml
13+
index a783c8f989..bea233cfb9 100644
14+
--- a/core/trino-web-ui/pom.xml
15+
+++ b/core/trino-web-ui/pom.xml
16+
@@ -103,28 +103,6 @@
17+
<workingDirectory>src/main/resources/webapp/src</workingDirectory>
18+
</configuration>
19+
</execution>
20+
- <execution>
21+
- <id>check (webapp)</id>
22+
- <goals>
23+
- <goal>npm</goal>
24+
- </goals>
25+
- <phase>verify</phase>
26+
- <configuration>
27+
- <arguments>run ${frontend.check.goal}</arguments>
28+
- <workingDirectory>src/main/resources/webapp/src</workingDirectory>
29+
- </configuration>
30+
- </execution>
31+
- <execution>
32+
- <id>check (webapp-preview)</id>
33+
- <goals>
34+
- <goal>npm</goal>
35+
- </goals>
36+
- <phase>verify</phase>
37+
- <configuration>
38+
- <arguments>run ${frontend.check.goal}</arguments>
39+
- <workingDirectory>src/main/resources/webapp-preview</workingDirectory>
40+
- </configuration>
41+
- </execution>
42+
<execution>
43+
<id>package (webapp-preview)</id>
44+
<goals>

0 commit comments

Comments
 (0)