Unverified Commit f632d18a authored by simon's avatar simon Committed by GitHub
Browse files

Merge pull request #5 from apache/dev

a
parents 7b92a777 2b0b93b9
Loading
Loading
Loading
Loading
+9 −5
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ 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
@@ -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

+10 −7
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
+0 −1
Original line number Diff line number Diff line
@@ -145,6 +145,5 @@ 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
+67 −27
Original line number Diff line number Diff line
* First from the remote repository *https://github.com/apache/incubator-dolphinscheduler.git* fork code to your own repository

* there are three branches in the remote repository currently:
     * master normal delivery branch
            After the stable version is released, the code for the stable version branch is merged into the master branch.
# Development

    * dev daily development branch
            The daily development branch, the newly submitted code can pull requests to this branch.
Start by forking the dolphinscheduler GitHub repository, make changes in a branch and then send a pull request.

## Set up your dolphinscheduler GitHub Repository

* Clone your own warehouse to your local
There are three branches in the remote repository currently:
  - `master` : normal delivery branch. After the stable version is released, the code for the stable version branch is merged into the master branch.
            
    `git clone https://github.com/apache/incubator-dolphinscheduler.git`
  - `dev` : daily development branch. The daily development branch, the newly submitted code can pull requests to this branch.
  
* Add remote repository address, named upstream
  - `x.x.x-release` : the stable release version.

   `git remote add upstream https://github.com/apache/incubator-dolphinscheduler.git`
So, you should fork the `dev` branch.

* View repository:
After forking the [dolphinscheduler upstream source repository](https://github.com/apache/incubator-dolphinscheduler/fork) to your personal repository, you can set your  personal development environment.

    `git remote -v`
```sh
$ cd <your work direcotry>
$ git clone < your personal forked dolphinscheduler repo>
$ cd incubator-dolphinscheduler
```

## Set git remote as ``upstream``

Add remote repository address, named upstream

> There will be two repositories at this time: origin (your own warehouse) and upstream (remote repository)
```sh
git remote add upstream https://github.com/apache/incubator-dolphinscheduler.git
```

View repository:

* Get/update remote repository code (already the latest code, skip it)
```sh
git remote -v
```

   `git fetch upstream`
There will be two repositories at this time: origin (your own warehouse) and upstream (remote repository)

Get/update remote repository code (already the latest code, skip it).

* Synchronize remote repository code to local repository

```sh
git fetch upstream
```

Synchronize remote repository code to local repository

```sh
git checkout origin/dev
git merge --no-ff upstream/dev
```
@@ -41,24 +59,46 @@ git checkout -b dev-1.0 upstream/dev-1.0
git push --set-upstream origin dev1.0
```

* After modifying the code locally, submit it to your own repository:
## Create your feature branch
Before making code changes, make sure you create a separate branch for them.

```sh
$ git checkout -b <your-feature>
```

## Commit changes
After modifying the code locally, submit it to your own repository:

`git commit -m 'test commit'`
`git push`
```sh

git commit -m 'information about your feature'
```

## Push to the branch

* Submit changes to the remote repository

* On the github page, click on the new pull request.
Push your locally committed changes to the remote origin (your fork).

```
$ git push origin <your-feature>
```

## Create a pull request

After submitting changes to your remote repository, you should click on the new pull request On the following github page.

<p align = "center">
<img src = "http://geek.analysys.cn/static/upload/221/2019-04-02/90f3abbf-70ef-4334-b8d6-9014c9cf4c7f.png" width ="60%"/>
</p>

* Select the modified local branch and the branch to merge past to create a pull request.

Select the modified local branch and the branch to merge past to create a pull request.

<p align = "center">
<img src = "http://geek.analysys.cn/static/upload/221/2019-04-02/fe7eecfe-2720-4736-951b-b3387cf1ae41.png" width ="60%"/>
</p>

*  Next, the administrator is responsible for **merging** to complete the pull request
Next, the administrator is responsible for **merging** to complete the pull request.



ReleaseNotes.md

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line
## 1.2.0

### New Feature	
1. Support postgre sql
2. Change all Chinese names to English
3. Add flink and http task support
4. Cross project dependencies
5. Modify mybatis to mybatisplus, support multy databases.
6. Add export and import definition feaure
7. Github actions ci compile check
8. Add method and parameters comments
9. Add java doc for common module

	
### Enhancement	
1. Add license and notice files
2. Move batchDelete Process Define/Instance Outside for transactional
3. Remove space before and after login user name
4. Dockerfile optimization
5. Change mysql-connector-java scope to test
6. Owners and administrators can delete schedule
7. DB page rename and background color modification 
8. Add postgre performance monitor
9. Resolve style conflict, recipient cannot tab and value verification
10. Checkbox change background color and env to Chinese
11. Change chinese sql to english
12. Change sqlSessionTemplate singleton and reformat code 
13. The value of loadaverage should be two decimal places
14. Delete alert group need delete the relation of user and alert group
15. Remove check resources when delete tenant
16. Check processInstance state before delete worker group 
17. Add check user and definitions function when delete tenant
18. Delete before check to avoid KeeperException$NoNodeException

### Bug Fixes
1. Fix #1245, make scanCommand transactional 
2. Fix ZKWorkerClient not close PathChildrenCache
3. Data type convert error ,email send error bug fix
4. Catch exception transaction method does not take effect to modify
5. Fix the spring transaction not worker bug
6. Task log print worker log bug fix
7. Fix api server debug mode bug
8. The task is abnormal and task is running bug fix
9. Fix bug: tasks queue length error
10. Fix unsuitable error message
11. Fix bug: phone can be empty
12. Fix email error password
13. Fix CheckUtils.checkUserParams method
14. The process cannot be terminated while tasks in the status submit success
15. Fix too many connection in upgrade or create 
16. Fix the bug when worker execute task using queue. and remove checking
17. Resole verify udf name error and delete udf error 
18. Fix bug: task cannot submit when recovery failover
19. Fix bug: the administrator authorizes the project to ordinary users,but ordinary users cannot see the process definition created by the administrator
20. Fix bug: create dolphinscheduler sql failed
 No newline at end of file
Loading