You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ch...@apache.org on 2023/04/12 12:14:49 UTC
[kyuubi] 03/04: Revert "[KYUUBI #4274] [FOLLOWUP] Increase maximum degree of concurrency for mvnd in CI jobs"
This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
commit 1c6965270a10dc792a528ec74a8214efd8d6afa3
Author: Cheng Pan <ch...@apache.org>
AuthorDate: Wed Apr 12 20:09:25 2023 +0800
Revert "[KYUUBI #4274] [FOLLOWUP] Increase maximum degree of concurrency for mvnd in CI jobs"
This reverts commit 5fab9b710ae048f165d4467d0368eb5d41ed50c1.
---
.github/actions/setup-mvnd/action.yaml | 6 +-----
.github/workflows/dep.yml | 2 +-
.github/workflows/style.yml | 6 +++---
build/mvnd | 7 +------
4 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/.github/actions/setup-mvnd/action.yaml b/.github/actions/setup-mvnd/action.yaml
index 55c8139ff..d7497e332 100644
--- a/.github/actions/setup-mvnd/action.yaml
+++ b/.github/actions/setup-mvnd/action.yaml
@@ -17,7 +17,6 @@
name: 'setup-mvnd'
description: 'Setup the maven daemon'
-continue-on-error: true
runs:
using: composite
steps:
@@ -27,10 +26,7 @@ runs:
path: |
build/maven-mvnd-*
build/apache-maven-*
- key: setup-mvnd-${{ runner.os }}
- - name: Check Maven
- run: build/mvn -v
- shell: bash
+ key: setup-mvnd-${{ runner.os }}-mvnd
- name: Check Mvnd
run: build/mvnd -v
shell: bash
diff --git a/.github/workflows/dep.yml b/.github/workflows/dep.yml
index 72f5c915d..ebda6b47e 100644
--- a/.github/workflows/dep.yml
+++ b/.github/workflows/dep.yml
@@ -50,7 +50,7 @@ jobs:
- name: Check kyuubi modules available
id: modules-check
run: >-
- build/mvnd dependency:resolve validate -q
+ build/mvnd dependency:resolve validate
-DincludeGroupIds="org.apache.kyuubi" -DincludeScope="compile"
-Pfast -Denforcer.skip=false
-pl kyuubi-ctl,kyuubi-server,kyuubi-assembly -am
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index 6ca1903e1..562e93120 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -56,7 +56,7 @@ jobs:
cache: 'pip'
- name: Check kyuubi modules available
id: modules-check
- run: build/mvnd dependency:resolve -DincludeGroupIds="org.apache.kyuubi" -DincludeScope="compile" -DexcludeTransitive=true -q ${{ matrix.profiles }}
+ run: build/mvnd dependency:resolve -DincludeGroupIds="org.apache.kyuubi" -DincludeScope="compile" -DexcludeTransitive=true ${{ matrix.profiles }}
continue-on-error: true
- name: Install
@@ -71,7 +71,7 @@ jobs:
- name: Scalastyle with maven
id: scalastyle-check
- run: build/mvnd scalastyle:check -q ${{ matrix.profiles }}
+ run: build/mvnd scalastyle:check ${{ matrix.profiles }}
- name: Print scalastyle error report
if: failure() && steps.scalastyle-check.outcome != 'success'
run: >-
@@ -85,7 +85,7 @@ jobs:
run: |
SPOTLESS_BLACK_VERSION=$(build/mvn help:evaluate -Dexpression=spotless.python.black.version -q -DforceStdout)
pip install black==$SPOTLESS_BLACK_VERSION
- build/mvnd spotless:check -q ${{ matrix.profiles }} -Pspotless-python
+ build/mvnd spotless:check ${{ matrix.profiles }} -Pspotless-python
- name: setup npm
uses: actions/setup-node@v3
with:
diff --git a/build/mvnd b/build/mvnd
index 9af3429f3..493ee43ad 100755
--- a/build/mvnd
+++ b/build/mvnd
@@ -25,7 +25,7 @@ _CALLING_DIR="$(pwd)"
_COMPILE_JVM_OPTS="-Xms2g -Xmx2g -XX:ReservedCodeCacheSize=1g -Xss128m"
if [ "$CI" ]; then
- export MAVEN_CLI_OPTS="-Dmvnd.minThreads=8 --no-transfer-progress --errors --fail-fast -Dstyle.color=always"
+ export MAVEN_CLI_OPTS="--no-transfer-progress --errors --fail-fast"
fi
# Installs any application tarball given a URL, the expected tarball name,
@@ -131,9 +131,4 @@ cd "${_CALLING_DIR}"
export MAVEN_OPTS=${MAVEN_OPTS:-"$_COMPILE_JVM_OPTS"}
echo "Using \`mvnd\` from path: $MVND_BIN" 1>&2
-
-if [ "$MAVEN_CLI_OPTS" != "" ]; then
- echo "MAVEN_CLI_OPTS=$MAVEN_CLI_OPTS"
-fi
-
${MVND_BIN} $MAVEN_CLI_OPTS "$@"