[kylin] 05/05: Fix check-env.sh

[xx...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit bf07880b9c634996a4f699daa4bdc7e6f8e33501
Author: XiaoxiangYu <xx...@apache.org>
AuthorDate: Fri Aug 26 13:40:32 2022 +0800

    Fix check-env.sh
---
 .github/pull_request_template.md | 14 +++++---------
 .travis.yml                      |  1 -
 build/bin/check-env.sh           |  6 +++---
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 5bd1dff74a..9edf0aa092 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,14 +2,10 @@
 
 Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue.
 
-## Github Branch 
-
-As most of the development works are on Kylin 4, we need to switch it as main branch. Apache Kylin community changes the branch settings on Github since 2021-08-04 :
-
-1. The default branch _main_ is for **Kylin 4.x** (Parquet storage);
-2. The original branch _master_ for **Kylin 3.x** (HBase storage) has been renamed to **kylin3** ;
-
-Please check [Intro to Kylin 4 architecture](https://kylin.apache.org/blog/2021/07/02/Apache-Kylin4-A-new-storage-and-compute-architecture/) and [INFRA-22166](https://issues.apache.org/jira/browse/INFRA-22166) if you are interested.
+## Branch to commit
+- [ ] Branch **kylin3** for v2.x to v3.x
+- [ ] Branch **kylin4** for v4.x
+- [ ] Branch **kylin5** for v5.x
 
 ## Types of changes
 
@@ -25,7 +21,7 @@ _Put an `x` in the boxes that apply_
 
 _Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code._
 
-- [ ] I have create an issue on [Kylin's jira](https://issues.apache.org/jira/browse/KYLIN), and have described the bug/feature there in detail
+- [ ] I have created an issue on [Kylin's jira](https://issues.apache.org/jira/browse/KYLIN), and have described the bug/feature there in detail
 - [ ] Commit messages in my PR start with the related jira ID, like "KYLIN-0000 Make Kylin project open-source"
 - [ ] Compiling and unit tests pass locally with my changes
 - [ ] I have added tests that prove my fix is effective or that my feature works
diff --git a/.travis.yml b/.travis.yml
index 95a6fe93bc..ac9ccf8731 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,6 @@ before_install:
 script:
   # mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test coveralls:report -e
   # Skip coveralls temporarily, fix it asap
-  - mvn clean test -q
   - mvn clean test -q -Psandbox -Pspark3
   - if [[ -n "${TRAVIS_PULL_REQUEST_SLUG}" && "${TRAVIS_PULL_REQUEST_SLUG}" != "${TRAVIS_REPO_SLUG}" ]]; then
         echo "The pull request from ${TRAVIS_PULL_REQUEST_SLUG} is an EXTERNAL pull request. Skip sonar analysis.";
diff --git a/build/bin/check-env.sh b/build/bin/check-env.sh
index 38927a64bb..7eb5012186 100755
--- a/build/bin/check-env.sh
+++ b/build/bin/check-env.sh
@@ -76,7 +76,7 @@ if [ -z "$WORKING_DIR" ]
 then
     quit "Please set kylin.env.hdfs-working-dir in kylin.properties"
 fi
-if [[ ${WORKING_DIR:0:3} -eq "s3a" ]]
+if [[ "${WORKING_DIR:0:3}" == "s3a" ]]
 then
     WORKING_DIR=${WORKING_DIR/"s3a"/"s3"}
 fi
@@ -94,7 +94,7 @@ fi
 SPARK_EVENTLOG_DIR=`bash $KYLIN_HOME/bin/get-properties.sh kylin.engine.spark-conf.spark.eventLog.dir`
 if [ -n "$SPARK_EVENTLOG_DIR" ]
 then
-    if [[ ${SPARK_EVENTLOG_DIR:0:3} -eq "s3a" ]]
+    if [[ "${SPARK_EVENTLOG_DIR:0:3}" == "s3a" ]]
     then
         SPARK_EVENTLOG_DIR=${SPARK_EVENTLOG_DIR/"s3a"/"s3"}
     fi
@@ -108,7 +108,7 @@ fi
 SPARK_HISTORYLOG_DIR=`bash $KYLIN_HOME/bin/get-properties.sh kylin.engine.spark-conf.spark.history.fs.logDirectory`
 if [ -n "$SPARK_HISTORYLOG_DIR" ]
 then
-    if [[ ${SPARK_HISTORYLOG_DIR:0:3} -eq "s3a" ]]
+    if [[ "${SPARK_HISTORYLOG_DIR:0:3}" == "s3a" ]]
     then
         SPARK_HISTORYLOG_DIR=${SPARK_HISTORYLOG_DIR/"s3a"/"s3"}
     fi