Skip to content

Commit 3881469

Browse files
committed
[KYUUBI #1763] [INFRA] Remove scala installation inbuild/mvn and using warn level for the ci
<!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html 2. If the PR is related to an issue in https://github.com/apache/incubator-kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'. 3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'. --> ### _Why are the changes needed?_ <!-- Please clarify why the changes are needed. For instance, 1. If you add a feature, you can talk about the use case of it. 2. If you fix a bug, you can clarify why it is a bug. --> 1. remove the unnecessary scala installation 2. maven compiler log to warn level to filter a lot of annoying message ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [ ] Add screenshots for manual tests if appropriate - [x] [Run test](https://kyuubi.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request Closes #1763 from yaooqinn/ci2. Closes #1763 c0f1114 [Kent Yao] fix dfd75dd [Kent Yao] fix 01fcc3f [Kent Yao] fix 94c62e4 [Kent Yao] Merge branch 'master' of github.com:apache/incubator-kyuubi into ci2 aab62e6 [Kent Yao] fix b38b52c [Kent Yao] ci 51cc7db [Kent Yao] nit Authored-by: Kent Yao <yao@apache.org> Signed-off-by: Kent Yao <yao@apache.org>
1 parent ce42d34 commit 3881469

File tree

2 files changed

+4
-23
lines changed

2 files changed

+4
-23
lines changed

.github/workflows/master.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
${{ runner.os }}-maven-io-
7979
- name: Build with Maven
8080
run: >-
81-
./build/mvn clean install -Dmaven.javadoc.skip=true -Drat.skip=true -Dscalastyle.skip=true -Dspotless.check.skip -V
81+
./build/mvn clean install -Dmaven.javadoc.skip=true -Drat.skip=true -Dscalastyle.skip=true -Dspotless.check.skip -Dorg.slf4j.simpleLogger.defaultLogLevel=warn -V
8282
-Pspark-${{ matrix.spark }} -Pspark-hadoop-${{ matrix.spark-hadoop }} ${{ matrix.profiles }}
8383
- name: Code coverage
8484
if: ${{ matrix.codecov == 'true' }}
@@ -136,7 +136,7 @@ jobs:
136136
${{ runner.os }}-maven-io-
137137
- name: Run TPC-DS Tests
138138
run: >-
139-
./build/mvn clean install -Dmaven.javadoc.skip=true -Drat.skip=true -Dscalastyle.skip=true -Dspotless.check.skip -V
139+
./build/mvn clean install -Dmaven.javadoc.skip=true -Drat.skip=true -Dscalastyle.skip=true -Dspotless.check.skip -Dorg.slf4j.simpleLogger.defaultLogLevel=warn -V
140140
-pl kyuubi-server -am
141141
-Pspark-3.1
142142
-Dmaven.plugin.scalatest.exclude.tags=''
@@ -177,7 +177,7 @@ jobs:
177177
run: kubectl get pods
178178
- name: integration tests
179179
run: >-
180-
./build/mvn clean install -Dmaven.javadoc.skip=true -Drat.skip=true -Dscalastyle.skip=true -Dspotless.check.skip -V
180+
./build/mvn clean install -Dmaven.javadoc.skip=true -Drat.skip=true -Dscalastyle.skip=true -Dspotless.check.skip -Dorg.slf4j.simpleLogger.defaultLogLevel=warn -V
181181
-pl integration-tests/kyuubi-kubernetes-deployment-it -am
182182
-Pkubernetes-deployment-it
183183
-Dtest=none -DwildcardSuites=org.apache.kyuubi.kubernetes.test

build/mvn

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ _CALLING_DIR="$(pwd)"
2525
_COMPILE_JVM_OPTS="-Xms2g -Xmx2g -XX:ReservedCodeCacheSize=1g -Xss128m"
2626

2727
if [ "$CI" ]; then
28-
export MAVEN_CLI_OPTS="--batch-mode --no-transfer-progress --errors --fail-fast"
28+
export MAVEN_CLI_OPTS="--no-transfer-progress --errors --fail-fast"
2929
fi
3030

3131
# Installs any application tarball given a URL, the expected tarball name,
@@ -88,25 +88,6 @@ install_mvn() {
8888
fi
8989
}
9090

91-
# Determine the Scala version from the root pom.xml file, set the Scala URL,
92-
# and, with that, download the specific version of Scala necessary under
93-
# the build/ folder
94-
install_scala() {
95-
# determine the Scala version used in Spark
96-
local scala_version=`grep "scala.version" "${_DIR}/../pom.xml" | head -n1 | awk -F '[<>]' '{print $3}'`
97-
local scala_bin="${_DIR}/scala-${scala_version}/bin/scala"
98-
local TYPESAFE_MIRROR=${TYPESAFE_MIRROR:-https://downloads.typesafe.com}
99-
100-
install_app \
101-
"${TYPESAFE_MIRROR}/scala/${scala_version}" \
102-
"scala-${scala_version}.tgz" \
103-
"scala-${scala_version}/bin/scala"
104-
105-
SCALA_COMPILER="$(cd "$(dirname "${scala_bin}")/../lib" && pwd)/scala-compiler.jar"
106-
SCALA_LIBRARY="$(cd "$(dirname "${scala_bin}")/../lib" && pwd)/scala-library.jar"
107-
}
108-
109-
install_scala
11091
install_mvn
11192

11293
cd "${_CALLING_DIR}"

0 commit comments

Comments
 (0)