Browse Source

[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
3.0.0/version-upgrade
kezhenxu94 3 years ago committed by GitHub
parent
commit
d2a360480a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      .github/workflows/e2e.yml
  2. 1
      .gitignore
  3. 2
      dolphinscheduler-api/pom.xml
  4. 2
      dolphinscheduler-dist/pom.xml
  5. 2
      dolphinscheduler-e2e/dolphinscheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java
  6. 2
      dolphinscheduler-standalone-server/src/main/assembly/dolphinscheduler-standalone-server.xml
  7. 47
      dolphinscheduler-ui-next/pom.xml
  8. 3
      pom.xml

1
.github/workflows/e2e.yml

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

1
.gitignore vendored

@ -45,6 +45,7 @@ dolphinscheduler-alert/src/main/resources/logback.xml
dolphinscheduler-server/src/main/resources/logback.xml dolphinscheduler-server/src/main/resources/logback.xml
dolphinscheduler-ui/dist dolphinscheduler-ui/dist
dolphinscheduler-ui/node dolphinscheduler-ui/node
dolphinscheduler-ui-next/node
dolphinscheduler-common/sql dolphinscheduler-common/sql
dolphinscheduler-common/test dolphinscheduler-common/test
dolphinscheduler-worker/logs dolphinscheduler-worker/logs

2
dolphinscheduler-api/pom.xml

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

2
dolphinscheduler-dist/pom.xml vendored

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

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

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

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

@ -101,7 +101,7 @@
<outputDirectory>conf</outputDirectory> <outputDirectory>conf</outputDirectory>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${basedir}/../dolphinscheduler-ui/dist</directory> <directory>${basedir}/../dolphinscheduler-ui-next/dist</directory>
<outputDirectory>./ui</outputDirectory> <outputDirectory>./ui</outputDirectory>
</fileSet> </fileSet>
</fileSets> </fileSets>

47
dolphinscheduler-ui-next/pom.xml

@ -33,4 +33,51 @@
<npm.version>8.1.2</npm.version> <npm.version>8.1.2</npm.version>
<sonar.sources>src</sonar.sources> <sonar.sources>src</sonar.sources>
</properties> </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> </project>

3
pom.xml

@ -513,7 +513,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dolphinscheduler</groupId> <groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-ui</artifactId> <artifactId>dolphinscheduler-ui-next</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -1331,7 +1331,6 @@
<module>dolphinscheduler-spi</module> <module>dolphinscheduler-spi</module>
<module>dolphinscheduler-registry</module> <module>dolphinscheduler-registry</module>
<module>dolphinscheduler-task-plugin</module> <module>dolphinscheduler-task-plugin</module>
<module>dolphinscheduler-ui</module>
<module>dolphinscheduler-server</module> <module>dolphinscheduler-server</module>
<module>dolphinscheduler-common</module> <module>dolphinscheduler-common</module>
<module>dolphinscheduler-api</module> <module>dolphinscheduler-api</module>

Loading…
Cancel
Save