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/14 02:00:47 UTC
[dolphinscheduler] branch k-ui-next created (now fcfa1e9)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch k-ui-next
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git.
at fcfa1e9 [UI-NEXT] Fix wrong packaging locations
This branch includes the following new commits:
new fcfa1e9 [UI-NEXT] Fix wrong packaging locations
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[dolphinscheduler] 01/01: [UI-NEXT] Fix wrong packaging locations
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch k-ui-next
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit fcfa1e94a955d15ac2894c9e1ef880264da8208a
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Mon Mar 14 10:00:17 2022 +0800
[UI-NEXT] Fix wrong packaging locations
---
.github/workflows/frontend.yml | 6 +++---
.github/workflows/unit-test.yml | 3 ++-
.../src/main/assembly/dolphinscheduler-api-server.xml | 2 +-
dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml | 2 +-
dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml | 3 +++
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 64bcb2f..10302d1 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -23,15 +23,15 @@ on:
- dev
paths:
- '.github/workflows/frontend.yml'
- - 'dolphinscheduler-ui/**'
+ - 'dolphinscheduler-ui-next/**'
pull_request:
paths:
- '.github/workflows/frontend.yml'
- - 'dolphinscheduler-ui/**'
+ - 'dolphinscheduler-ui-next/**'
defaults:
run:
- working-directory: dolphinscheduler-ui
+ working-directory: dolphinscheduler-ui-next
concurrency:
group: frontend-${{ github.event.pull_request.number || github.ref }}
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 87a0b86..338bcc7 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -23,6 +23,7 @@ on:
paths-ignore:
- '**/*.md'
- 'dolphinscheduler-ui'
+ - 'dolphinscheduler-ui-next'
- 'dolphinscheduler-python/pydolphinscheduler'
branches:
- dev
@@ -76,7 +77,7 @@ jobs:
-Dsonar.core.codeCoveragePlugin=jacoco
-Dsonar.projectKey=apache-dolphinscheduler
-Dsonar.login=e4058004bc6be89decf558ac819aa1ecbee57682
- -Dsonar.exclusions=dolphinscheduler-ui/src/**/i18n/locale/*.js,dolphinscheduler-microbench/src/**/*
+ -Dsonar.exclusions=dolphinscheduler-ui/src/**/i18n/locale/*.js,dolphinscheduler-ui-next/src/**/i18n/locale/*.js,dolphinscheduler-microbench/src/**/*
-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/dolphinscheduler-api/src/main/assembly/dolphinscheduler-api-server.xml b/dolphinscheduler-api/src/main/assembly/dolphinscheduler-api-server.xml
index 792f921..edc99e8 100644
--- a/dolphinscheduler-api/src/main/assembly/dolphinscheduler-api-server.xml
+++ b/dolphinscheduler-api/src/main/assembly/dolphinscheduler-api-server.xml
@@ -56,7 +56,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-dist/src/main/assembly/dolphinscheduler-bin.xml b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml
index 769393d..5116857 100644
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml
@@ -71,7 +71,7 @@
</fileSet>
<fileSet>
- <directory>${basedir}/../dolphinscheduler-ui/dist</directory>
+ <directory>${basedir}/../dolphinscheduler-ui-next/dist</directory>
<outputDirectory>./ui</outputDirectory>
</fileSet>
diff --git a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml
index 05d5487..c33d256 100644
--- a/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml
+++ b/dolphinscheduler-dist/src/main/assembly/dolphinscheduler-src.xml
@@ -56,6 +56,9 @@
<exclude>**/dolphinscheduler-ui/dist/**</exclude>
<exclude>**/dolphinscheduler-ui/node/**</exclude>
<exclude>**/dolphinscheduler-ui/node_modules/**</exclude>
+ <exclude>**/dolphinscheduler-ui-next/dist/**</exclude>
+ <exclude>**/dolphinscheduler-ui-next/node/**</exclude>
+ <exclude>**/dolphinscheduler-ui-next/node_modules/**</exclude>
<!-- python ignore -->
<exclude>**/dolphinscheduler-python/pydolphinscheduler/.pytest_cache/**</exclude>