From 69de3d60e10b902f23ad7c0fe4a1d4aa97a6c021 Mon Sep 17 00:00:00 2001 From: xiangdong huang Date: Sat, 26 Dec 2020 15:30:55 +0800 Subject: [PATCH] 1. add pr template; 2. disable enforcer check in travis; 3. test sonar token --- .github/pull_request_template.md | 93 ++++++++++++++++++++++++ .github/workflows/sonar_and_coverall.yml | 2 +- .travis.yml | 10 +-- 3 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000000..6f1fa8c6488 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,93 @@ + + + + +## Description + + + + + + + +### Content1 ... +### Content2 ... +### Content3 ... + + + + + + + + + + +
+ +This PR has: +- [ ] been self-reviewed. + - [ ] concurrent read + - [ ] concurrent write + - [ ] concurrent read and write +- [ ] added documentation for new or modified features or behaviors. +- [ ] added Javadocs for most classes and all non-trivial methods. +- [ ] added or updated version, __license__, or notice information +- [ ] added comments explaining the "why" and the intent of the code wherever would not be obvious + for an unfamiliar reader. +- [ ] added unit tests or modified existing tests to cover new code paths, ensuring the threshold + for code coverage. +- [ ] added integration tests. +- [ ] been tested in a test IoTDB cluster. + + + +
+ +##### Key changed/added classes (or packages if there are too many classes) in this PR + + \ No newline at end of file diff --git a/.github/workflows/sonar_and_coverall.yml b/.github/workflows/sonar_and_coverall.yml index f3d85dd8be4..f8d201dc111 100644 --- a/.github/workflows/sonar_and_coverall.yml +++ b/.github/workflows/sonar_and_coverall.yml @@ -44,7 +44,7 @@ jobs: -Dsonar.organization=apache \ -Dsonar.projectKey=apache_incubator-iotdb \ -Dsonar.host.url=https://sonarcloud.io \ - -Dsonar.login=${{ env.SONAR_TOKEN }} \ + -Dsonar.login=${{ secrets.SONARCLOUD_TOKEN }} \ -DskipTests -pl '!distribution' -am coveralls: diff --git a/.travis.yml b/.travis.yml index 0b074df8d12..bbe2d79e2a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -110,10 +110,10 @@ matrix: - rm -rf /Users/travis/.m2/repository/org/apache/tomcat - java -version - mvn -version - - mvn -B apache-rat:check + - mvn -B apache-rat:check -Denforcer.skip=true # Output something every 10 minutes or Travis kills the job - while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done & - - mvn -B clean test integration-test -Dtest.port.closed=true + - mvn -B clean test integration-test -Dtest.port.closed=true -Denforcer.skip=true # Killing background sleep loop - kill %1 - os: linux @@ -136,7 +136,7 @@ matrix: jdk: openjdk8 script: # now, grafana has no tests; spark-* tests are written by scala - - mvn post-integration-test -Pcode-coverage -Pcoveralls -pl '!distribution' -am + - mvn post-integration-test -Pcode-coverage -Pcoveralls -pl '!distribution' -am -Denforcer.skip=true after_success: - mvn coveralls:report -DserviceName=travis_ci -pl tsfile,server,jdbc,client,session,hive-connector,flink-iotdb-connector,flink-tsfile-connector # - os: linux @@ -182,10 +182,10 @@ script: - rm -rf /Users/travis/.m2/repository/org/apache/tomcat - java -version - mvn -version - - mvn -B apache-rat:check + - mvn -B apache-rat:check -Denforcer.skip=true # Output something every 10 minutes or Travis kills the job - while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done & - - mvn -B clean test integration-test -Dtest.port.closed=true + - mvn -B clean test integration-test -Dtest.port.closed=true -Denforcer.skip=true # Killing background sleep loop - kill %1