Browse Source

Optimize ci (#1085)

* opimize ci

fix dag flink image link bug

* revert package.json
pull/2/head
khadgarmage 5 years ago committed by bao liang
parent
commit
0200b94735
  1. 25
      .github/workflows/ci.yml
  2. 47
      .github/workflows/ci_backend.yml
  3. 41
      .github/workflows/ci_frontend.yml
  4. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
  5. 1
      pom.xml

25
.github/workflows/ci.yml

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

47
.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

41
.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

2
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%;

1
pom.xml

@ -539,6 +539,7 @@
<exclude>**/dolphinscheduler-ui/src/view/common/outro.inc</exclude>
<exclude>**/dolphinscheduler-ui/src/view/common/meta.inc</exclude>
<exclude>**/dolphinscheduler-ui/src/combo/1.0.0/3rd.css</exclude>
<exclude>**/dolphinscheduler-rpc/src/main/java/org/apache/dolphinscheduler/rpc/LogViewServiceGrpc.java</exclude>
</excludes>
<consoleOutput>true</consoleOutput>
</configuration>

Loading…
Cancel
Save