From 9e9ef71a1ac6e27815164e4ad256f70bcdb2278c Mon Sep 17 00:00:00 2001 From: dervoeti Date: Wed, 18 Jun 2025 15:24:19 +0200 Subject: [PATCH] fix(trino): Disable checking of trino-web-ui --- .../470/0001-Add-CycloneDX-plugin.patch | 2 +- ...ode-checking-because-flow-v0.241.0-f.patch | 44 +++++++++++++++++++ ...ode-checking-because-flow-v0.241.0-f.patch | 44 +++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 trino/trino/stackable/patches/470/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch create mode 100644 trino/trino/stackable/patches/476/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch diff --git a/trino/trino/stackable/patches/470/0001-Add-CycloneDX-plugin.patch b/trino/trino/stackable/patches/470/0001-Add-CycloneDX-plugin.patch index cfce1af20..df8c3a293 100644 --- a/trino/trino/stackable/patches/470/0001-Add-CycloneDX-plugin.patch +++ b/trino/trino/stackable/patches/470/0001-Add-CycloneDX-plugin.patch @@ -8,7 +8,7 @@ Subject: Add CycloneDX plugin 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml -index a1604d5ebec..3f9f7945046 100644 +index a1604d5ebe..3f9f794504 100644 --- a/pom.xml +++ b/pom.xml @@ -2814,6 +2814,24 @@ diff --git a/trino/trino/stackable/patches/470/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch b/trino/trino/stackable/patches/470/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch new file mode 100644 index 000000000..b6da7c4f1 --- /dev/null +++ b/trino/trino/stackable/patches/470/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch @@ -0,0 +1,44 @@ +From 1ec0bcdafe9f74f37b6e791e3df6b552ba748538 Mon Sep 17 00:00:00 2001 +From: dervoeti +Date: Wed, 18 Jun 2025 15:22:49 +0200 +Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86 + systems requires glibc 2.35, as of 2025-06-18 our UBI image comes with glibc + 2.34. This patch can likely be removed once we ship a newer version of glibc. + +--- + core/trino-web-ui/pom.xml | 22 ---------------------- + 1 file changed, 22 deletions(-) + +diff --git a/core/trino-web-ui/pom.xml b/core/trino-web-ui/pom.xml +index d097a1e22f..98c7516af1 100644 +--- a/core/trino-web-ui/pom.xml ++++ b/core/trino-web-ui/pom.xml +@@ -103,28 +103,6 @@ + src/main/resources/webapp/src + + +- +- check (webapp) +- +- npm +- +- verify +- +- run ${frontend.check.goal} +- src/main/resources/webapp/src +- +- +- +- check (webapp-preview) +- +- npm +- +- verify +- +- run ${frontend.check.goal} +- src/main/resources/webapp-preview +- +- + + package (webapp-preview) + diff --git a/trino/trino/stackable/patches/476/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch b/trino/trino/stackable/patches/476/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch new file mode 100644 index 000000000..c8c080232 --- /dev/null +++ b/trino/trino/stackable/patches/476/0002-Disable-web-ui-code-checking-because-flow-v0.241.0-f.patch @@ -0,0 +1,44 @@ +From c69033a355820753a49772be984b9c735ce8b92d Mon Sep 17 00:00:00 2001 +From: dervoeti +Date: Wed, 18 Jun 2025 14:05:10 +0200 +Subject: Disable web-ui code checking, because flow v0.241.0 for non-x86 + systems requires glibc 2.35, as of 2025-06-18 our UBI image comes with glibc + 2.34. This patch can likely be removed once we ship a newer version of glibc. + +--- + core/trino-web-ui/pom.xml | 22 ---------------------- + 1 file changed, 22 deletions(-) + +diff --git a/core/trino-web-ui/pom.xml b/core/trino-web-ui/pom.xml +index a783c8f989..bea233cfb9 100644 +--- a/core/trino-web-ui/pom.xml ++++ b/core/trino-web-ui/pom.xml +@@ -103,28 +103,6 @@ + src/main/resources/webapp/src + + +- +- check (webapp) +- +- npm +- +- verify +- +- run ${frontend.check.goal} +- src/main/resources/webapp/src +- +- +- +- check (webapp-preview) +- +- npm +- +- verify +- +- run ${frontend.check.goal} +- src/main/resources/webapp-preview +- +- + + package (webapp-preview) +