Skip to content

Commit 1c69652

Browse files
committed
Revert "[KYUUBI #4274] [FOLLOWUP] Increase maximum degree of concurrency for mvnd in CI jobs"
This reverts commit 5fab9b7.
1 parent af82f4d commit 1c69652

File tree

4 files changed

+6
-15
lines changed

4 files changed

+6
-15
lines changed

.github/actions/setup-mvnd/action.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
name: 'setup-mvnd'
1919
description: 'Setup the maven daemon'
20-
continue-on-error: true
2120
runs:
2221
using: composite
2322
steps:
@@ -27,10 +26,7 @@ runs:
2726
path: |
2827
build/maven-mvnd-*
2928
build/apache-maven-*
30-
key: setup-mvnd-${{ runner.os }}
31-
- name: Check Maven
32-
run: build/mvn -v
33-
shell: bash
29+
key: setup-mvnd-${{ runner.os }}-mvnd
3430
- name: Check Mvnd
3531
run: build/mvnd -v
3632
shell: bash

.github/workflows/dep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Check kyuubi modules available
5151
id: modules-check
5252
run: >-
53-
build/mvnd dependency:resolve validate -q
53+
build/mvnd dependency:resolve validate
5454
-DincludeGroupIds="org.apache.kyuubi" -DincludeScope="compile"
5555
-Pfast -Denforcer.skip=false
5656
-pl kyuubi-ctl,kyuubi-server,kyuubi-assembly -am

.github/workflows/style.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
cache: 'pip'
5757
- name: Check kyuubi modules available
5858
id: modules-check
59-
run: build/mvnd dependency:resolve -DincludeGroupIds="org.apache.kyuubi" -DincludeScope="compile" -DexcludeTransitive=true -q ${{ matrix.profiles }}
59+
run: build/mvnd dependency:resolve -DincludeGroupIds="org.apache.kyuubi" -DincludeScope="compile" -DexcludeTransitive=true ${{ matrix.profiles }}
6060
continue-on-error: true
6161

6262
- name: Install
@@ -71,7 +71,7 @@ jobs:
7171
7272
- name: Scalastyle with maven
7373
id: scalastyle-check
74-
run: build/mvnd scalastyle:check -q ${{ matrix.profiles }}
74+
run: build/mvnd scalastyle:check ${{ matrix.profiles }}
7575
- name: Print scalastyle error report
7676
if: failure() && steps.scalastyle-check.outcome != 'success'
7777
run: >-
@@ -85,7 +85,7 @@ jobs:
8585
run: |
8686
SPOTLESS_BLACK_VERSION=$(build/mvn help:evaluate -Dexpression=spotless.python.black.version -q -DforceStdout)
8787
pip install black==$SPOTLESS_BLACK_VERSION
88-
build/mvnd spotless:check -q ${{ matrix.profiles }} -Pspotless-python
88+
build/mvnd spotless:check ${{ matrix.profiles }} -Pspotless-python
8989
- name: setup npm
9090
uses: actions/setup-node@v3
9191
with:

build/mvnd

Lines changed: 1 addition & 6 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="-Dmvnd.minThreads=8 --no-transfer-progress --errors --fail-fast -Dstyle.color=always"
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,
@@ -131,9 +131,4 @@ cd "${_CALLING_DIR}"
131131
export MAVEN_OPTS=${MAVEN_OPTS:-"$_COMPILE_JVM_OPTS"}
132132

133133
echo "Using \`mvnd\` from path: $MVND_BIN" 1>&2
134-
135-
if [ "$MAVEN_CLI_OPTS" != "" ]; then
136-
echo "MAVEN_CLI_OPTS=$MAVEN_CLI_OPTS"
137-
fi
138-
139134
${MVND_BIN} $MAVEN_CLI_OPTS "$@"

0 commit comments

Comments
 (0)