seg_yinzy
/
DolphinScheduler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[CI][UI NEXT] Package new UI into release tar and remove old UI from it (#8670) 

* [CI][UI NEXT] Package new UI into release tar and remove old UI from it

* Update e2e.yml
slim
kezhenxu94 2022-03-07 11:20:24 +08:00 committed by GitHub
parent ac18b195ec
commit d2a360480a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/e2e.yml vendored
View File

@ -64,6 +64,7 @@ jobs:
retention-days: 1
e2e:
name: ${{ matrix.case.name }}
if: false
needs: build
runs-on: ubuntu-latest
strategy:

1
.gitignore vendored
View File

@ -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

2
dolphinscheduler-api/pom.xml
View File

@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-ui</artifactId>
<artifactId>dolphinscheduler-ui-next</artifactId>
</dependency>
<!--springboot-->

2
dolphinscheduler-dist/pom.xml
View File

@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-ui</artifactId>
<artifactId>dolphinscheduler-ui-next</artifactId>
</dependency>
<dependency>

2
dolphinscheduler-e2e/dolphinscheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java
View File

@ -157,7 +157,7 @@ final class DolphinSchedulerExtension
}
};
address = HostAndPort.fromParts("dolphinscheduler", 12345);
rootPath = "/dolphinscheduler";
rootPath = "/dolphinscheduler/ui/";
}
@Override

2
dolphinscheduler-standalone-server/src/main/assembly/dolphinscheduler-standalone-server.xml
View File

@ -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>

47
dolphinscheduler-ui-next/pom.xml
View File

@ -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>

3
pom.xml
View File

@ -513,7 +513,7 @@
</dependency>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-ui</artifactId>
<artifactId>dolphinscheduler-ui-next</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@ -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>