From 0200b94735ba4d69b41eb0e4d2d6303698b0ae72 Mon Sep 17 00:00:00 2001 From: khadgarmage Date: Thu, 24 Oct 2019 10:45:33 +0800 Subject: [PATCH] Optimize ci (#1085) * opimize ci fix dag flink image link bug * revert package.json --- .github/workflows/ci.yml | 25 ---------- .github/workflows/ci_backend.yml | 47 +++++++++++++++++++ .github/workflows/ci_frontend.yml | 41 ++++++++++++++++ .../js/conf/home/pages/dag/_source/dag.scss | 2 +- pom.xml | 1 + 5 files changed, 90 insertions(+), 26 deletions(-) delete mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/ci_backend.yml create mode 100644 .github/workflows/ci_frontend.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index c627b2b9fe..0000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: CI - -on: [push, pull_request] - -jobs: - Compile-check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: check - run: mvn -U -B clean package assembly:assembly -Dmaven.test.skip=true - License-check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: check - run: mvn -B apache-rat:check diff --git a/.github/workflows/ci_backend.yml b/.github/workflows/ci_backend.yml new file mode 100644 index 0000000000..53a32ac464 --- /dev/null +++ b/.github/workflows/ci_backend.yml @@ -0,0 +1,47 @@ +name: Backend + +on: + push: + paths: + - '.github/workflows/ci_backend.yml' + - 'package.xml' + - 'pom.xml' + - 'dolphinscheduler-alert/**' + - 'dolphinscheduler-api/**' + - 'dolphinscheduler-common/**' + - 'dolphinscheduler-dao/**' + - 'dolphinscheduler-rpc/**' + - 'dolphinscheduler-server/**' + pull_request: + paths: + - '.github/workflows/ci_backend.yml' + - 'package.xml' + - 'pom.xml' + - 'dolphinscheduler-alert/**' + - 'dolphinscheduler-api/**' + - 'dolphinscheduler-common/**' + - 'dolphinscheduler-dao/**' + - 'dolphinscheduler-rpc/**' + - 'dolphinscheduler-server/**' + +jobs: + Compile-check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Compile + run: mvn -U -B -T 1C clean package assembly:assembly -Dmaven.compile.fork=true -Dmaven.test.skip=true + License-check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Check + run: mvn -B apache-rat:check diff --git a/.github/workflows/ci_frontend.yml b/.github/workflows/ci_frontend.yml new file mode 100644 index 0000000000..67643ea9cf --- /dev/null +++ b/.github/workflows/ci_frontend.yml @@ -0,0 +1,41 @@ +name: Frontend + +on: + push: + paths: + - '.github/workflows/ci_frontend.yml' + - 'dolphinscheduler-ui/**' + pull_request: + paths: + - '.github/workflows/ci_frontend.yml' + - 'dolphinscheduler-ui/**' + +jobs: + Compile-check: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + steps: + - uses: actions/checkout@v1 + - name: Set up Node.js + uses: actions/setup-node@v1 + with: + version: 8 + - name: Compile + run: | + cd dolphinscheduler-ui + npm install node-sass --unsafe-perm + npm install + npm run build + + License-check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Check + run: mvn -B apache-rat:check diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss index a289a792d3..7fdb5e64f2 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss @@ -87,7 +87,7 @@ background: url("../img/toolbar_SPARK.png") no-repeat 50% 50%; } .icos-FLINK { - background: url("../img/toobar_flink.png") no-repeat 50% 50%; + background: url("../img/toobar_FLINK.png") no-repeat 50% 50%; } .icos-MR { background: url("../img/toolbar_MR.png") no-repeat 50% 50%; diff --git a/pom.xml b/pom.xml index 987407fc2b..2611d34abd 100644 --- a/pom.xml +++ b/pom.xml @@ -539,6 +539,7 @@ **/dolphinscheduler-ui/src/view/common/outro.inc **/dolphinscheduler-ui/src/view/common/meta.inc **/dolphinscheduler-ui/src/combo/1.0.0/3rd.css + **/dolphinscheduler-rpc/src/main/java/org/apache/dolphinscheduler/rpc/LogViewServiceGrpc.java true