You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2022/03/02 13:26:14 UTC
[dolphinscheduler] 01/01: [CI][UI NEXT] Package new UI into release tar and remove old UI from it
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch package-new-ui
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit a39986e82dbf03f5f67dff7573b691e170030f2d
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Wed Mar 2 21:25:00 2022 +0800
[CI][UI NEXT] Package new UI into release tar and remove old UI from it
---
.gitignore | 1 +
.../dolphinscheduler-standalone-server.xml | 2 +-
dolphinscheduler-ui-next/pom.xml | 47 ++++++++++++++++++++++
pom.xml | 1 -
4 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index edc8066..0a0aaaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@ dolphinscheduler-alert/src/main/resources/logback.xml
dolphinscheduler-server/src/main/resources/logback.xml
dolphinscheduler-ui/dist
dolphinscheduler-ui/node
+dolphinscheduler-ui-next/node
dolphinscheduler-common/sql
dolphinscheduler-common/test
dolphinscheduler-worker/logs
diff --git a/dolphinscheduler-standalone-server/src/main/assembly/dolphinscheduler-standalone-server.xml b/dolphinscheduler-standalone-server/src/main/assembly/dolphinscheduler-standalone-server.xml
index a17267b..9971ad0 100644
--- a/dolphinscheduler-standalone-server/src/main/assembly/dolphinscheduler-standalone-server.xml
+++ b/dolphinscheduler-standalone-server/src/main/assembly/dolphinscheduler-standalone-server.xml
@@ -101,7 +101,7 @@
<outputDirectory>conf</outputDirectory>
</fileSet>
<fileSet>
- <directory>${basedir}/../dolphinscheduler-ui/dist</directory>
+ <directory>${basedir}/../dolphinscheduler-ui-next/dist</directory>
<outputDirectory>./ui</outputDirectory>
</fileSet>
</fileSets>
diff --git a/dolphinscheduler-ui-next/pom.xml b/dolphinscheduler-ui-next/pom.xml
index dbd8733..8dff740 100644
--- a/dolphinscheduler-ui-next/pom.xml
+++ b/dolphinscheduler-ui-next/pom.xml
@@ -33,4 +33,51 @@
<npm.version>8.1.2</npm.version>
<sonar.sources>src</sonar.sources>
</properties>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>${frontend-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>install node and npm</id>
+ <goals>
+ <goal>install-node-and-npm</goal>
+ </goals>
+ <configuration>
+ <nodeVersion>${node.version}</nodeVersion>
+ <npmVersion>${npm.version}</npmVersion>
+ </configuration>
+ </execution>
+ <execution>
+ <id>npm install</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <arguments>install</arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>npm run build:prod</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>run build:prod</arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/pom.xml b/pom.xml
index 25c8648..4f09597 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1331,7 +1331,6 @@
<module>dolphinscheduler-spi</module>
<module>dolphinscheduler-registry</module>
<module>dolphinscheduler-task-plugin</module>
- <module>dolphinscheduler-ui</module>
<module>dolphinscheduler-server</module>
<module>dolphinscheduler-common</module>
<module>dolphinscheduler-api</module>