Unverified Commit ee3cdab8 authored by samz406's avatar samz406 Committed by GitHub
Browse files

Merge pull request #7 from apache/dev

update
parents aeeddbd5 c50ad124
Loading
Loading
Loading
Loading

.asf.yaml

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line
staging:
  profile: ~
  whoami: dev
  foo: trigger

publish:
  whoami: dev

github:
  description: “Dolphin Scheduler is a distributed and easy-to-extend visual DAG workflow scheduling system, dedicated to solving the complex dependencies in data processing, making the scheduling system out of the box for data processing.(分布式易扩展的可视化工作流任务调度)”
 No newline at end of file
+10 −6
Original line number Diff line number Diff line
@@ -49,12 +49,13 @@ jobs:
      - name: Docker Run
        run: |
          VERSION=`cat $(pwd)/pom.xml| grep "SNAPSHOT</version>" | awk -F "-SNAPSHOT" '{print $1}' | awk -F ">" '{print $2}'`
          docker run -dit -e POSTGRESQL_USERNAME=test -e POSTGRESQL_PASSWORD=test -p 8888:8888 dolphinscheduler:$VERSION all
          mkdir -p /tmp/logs
          docker run -dit -e POSTGRESQL_USERNAME=test -e POSTGRESQL_PASSWORD=test -v /tmp/logs:/opt/dolphinscheduler/logs -p 8888:8888 dolphinscheduler:$VERSION all
      - name: Check Server Status
        run: sh ./dockerfile/hooks/check
      - name: Prepare e2e env
        run: |
          sudo apt-get install -y libxss1 libappindicator1 libindicator7 xvfb unzip
          sudo apt-get install -y libxss1 libappindicator1 libindicator7 xvfb unzip libgbm1
          wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
          sudo dpkg -i google-chrome*.deb
          sudo apt-get install -f -y
@@ -65,7 +66,10 @@ jobs:
      - name: Run e2e Test
        run: cd ./e2e && mvn -B clean test
      - name: Collect logs
        run: |
          mkdir -p ${LOG_DIR}
          docker logs dolphinscheduler > ${LOG_DIR}/dolphinscheduler.txt
        continue-on-error: true
        if: failure()
        uses: actions/upload-artifact@v1
        with:
          name: dslogs
          path: /tmp/logs

+11 −8
Original line number Diff line number Diff line
@@ -15,7 +15,11 @@
# limitations under the License.
#

on: ["pull_request", "push"]
on:
  pull_request:
  push:
    branches:
      - dev
env:
  DOCKER_DIR: ./docker
  LOG_DIR: /tmp/dolphinscheduler
@@ -48,19 +52,18 @@ jobs:
        uses: actions/setup-java@v1
        with:
          java-version: 1.8
      - name: Git fetch unshallow
        run: |
          git fetch --unshallow
          git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
          git fetch origin
      - name: Compile
        run: |
          export MAVEN_OPTS='-Dmaven.repo.local=.m2/repository -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g'
          mvn test -B -Dmaven.test.skip=false
      - name: Upload coverage report to codecov
        if: github.event_name == 'pull_request'
        run: |
          CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash)
      - name: Git fetch unshallow
        run: |
          git fetch --unshallow
          git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
          git fetch origin
      - name: Run SonarCloud Analysis
        run: >
          mvn verify --batch-mode
+1 −1
Original line number Diff line number Diff line
@@ -145,6 +145,6 @@ dolphinscheduler-ui/dist/js/home/index.78a5d12.js.map
dolphinscheduler-ui/dist/js/login/index.291b8e3.js
dolphinscheduler-ui/dist/js/login/index.291b8e3.js.map
dolphinscheduler-ui/dist/lib/external/
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
/dolphinscheduler-dao/src/main/resources/dao/data_source.properties

!/zookeeper_data/

.mvn/jvm.config

0 → 100644
+1 −0
Original line number Diff line number Diff line
-Xmx1024m -XX:MaxMetaspaceSize=256m
Loading