This is an automated email from the ASF dual-hosted git repository.
wenjin272 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-agents.git
The following commit(s) were added to refs/heads/main by this push:
new 19338057 [infra] Skip spotless in non-lint CI jobs to isolate
code-style failures (#664)
19338057 is described below
commit 19338057c0beac302ef7344ec1e68dc7927056b5
Author: Weiqing Yang <[email protected]>
AuthorDate: Wed May 13 01:22:50 2026 -0700
[infra] Skip spotless in non-lint CI jobs to isolate code-style failures
(#664)
---
.github/workflows/build_wheel.yml | 6 ++++++
.github/workflows/ci.yml | 8 ++++++++
tools/build.sh | 12 +++++++++++-
tools/ut.sh | 18 ++++++++++++++----
4 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build_wheel.yml
b/.github/workflows/build_wheel.yml
index 6b9d153b..175963b1 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -47,6 +47,8 @@ jobs:
java_tests:
name: java tests on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
+ env:
+ SKIP_SPOTLESS_CHECK: true
strategy:
fail-fast: false
matrix:
@@ -90,6 +92,8 @@ jobs:
e2e_tests:
name: e2e tests on ${{ matrix.os }} ${{ matrix.python-version}}
runs-on: ${{ matrix.os }}
+ env:
+ SKIP_SPOTLESS_CHECK: true
strategy:
fail-fast: false
matrix:
@@ -118,6 +122,8 @@ jobs:
build_python_wheels:
name: "Build Python Wheels"
runs-on: ubuntu-latest
+ env:
+ SKIP_SPOTLESS_CHECK: true
steps:
- name: "Checkout the repository"
uses: actions/checkout@v4
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 92b00179..4001aee9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -72,6 +72,8 @@ jobs:
java_tests:
name: ut-java [${{ matrix.os }}] [java-${{ matrix.java-version}}]
[python-3.12]
runs-on: ${{ matrix.os }}
+ env:
+ SKIP_SPOTLESS_CHECK: true
strategy:
fail-fast: false
matrix:
@@ -136,6 +138,8 @@ jobs:
python_it_tests:
name: it-python [${{ matrix.os }}] [java-17] [python-${{
matrix.python-version}}] [flink-${{ matrix.flink-version}}]
runs-on: ${{ matrix.os }}
+ env:
+ SKIP_SPOTLESS_CHECK: true
strategy:
fail-fast: false
matrix:
@@ -179,6 +183,8 @@ jobs:
java_it_tests:
name: it-java [${{ matrix.os }}] [java-${{ matrix.java-version}}]
[flink-${{ matrix.flink-version}}]
runs-on: ${{ matrix.os }}
+ env:
+ SKIP_SPOTLESS_CHECK: true
strategy:
fail-fast: false
matrix:
@@ -214,6 +220,8 @@ jobs:
cross_language_tests:
name: cross-language [${{ matrix.os }}] [python-${{
matrix.python-version}}] [java-${{ matrix.java-version}}]
runs-on: ${{ matrix.os }}
+ env:
+ SKIP_SPOTLESS_CHECK: true
services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.19.0
diff --git a/tools/build.sh b/tools/build.sh
index 80f4b2f8..6a691a59 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -41,10 +41,20 @@ CURR_DIR=`pwd`
BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
PROJECT_ROOT="${BASE_DIR}/../"
+# Skip spotless code-style check when SKIP_SPOTLESS_CHECK is set.
+# Style enforcement is owned by the dedicated `Code Style Check` CI job
+# (and `tools/lint.sh` locally), so other CI jobs append this flag to
+# every mvn invocation to avoid masking real test failures with style
+# violations. Unset (default) preserves local-dev behavior.
+SPOTLESS_FLAG=""
+if [ "${SKIP_SPOTLESS_CHECK}" = "true" ] || [ "${SKIP_SPOTLESS_CHECK}" = "1"
]; then
+ SPOTLESS_FLAG="-Dspotless.skip=true"
+fi
+
# build java
if $build_java; then
mvn --version
- mvn clean install -DskipTests -B
+ mvn clean install -DskipTests -B ${SPOTLESS_FLAG}
fi
if $build_python; then
diff --git a/tools/ut.sh b/tools/ut.sh
index 3a0000fb..44b941ba 100755
--- a/tools/ut.sh
+++ b/tools/ut.sh
@@ -119,6 +119,16 @@ if $verbose; then
echo "Will run tests for Flink versions: ${flink_versions[*]}"
fi
+# Skip spotless code-style check when SKIP_SPOTLESS_CHECK is set.
+# Style enforcement is owned by the dedicated `Code Style Check` CI job
+# (and `tools/lint.sh` locally), so other CI jobs append this flag to
+# every mvn invocation to avoid masking real test failures with style
+# violations. Unset (default) preserves local-dev behavior.
+SPOTLESS_FLAG=""
+if [ "${SKIP_SPOTLESS_CHECK}" = "true" ] || [ "${SKIP_SPOTLESS_CHECK}" = "1"
]; then
+ SPOTLESS_FLAG="-Dspotless.skip=true"
+fi
+
java_tests() {
if $verbose; then
echo "Running Java tests..."
@@ -135,7 +145,7 @@ java_tests() {
done
dist_modules="${dist_modules#,}"
- mvn --batch-mode --no-transfer-progress install -pl "$dist_modules"
-DskipTests
+ mvn --batch-mode --no-transfer-progress install -pl "$dist_modules"
-DskipTests ${SPOTLESS_FLAG}
install_code=$?
if [ $install_code -ne 0 ]; then
echo "Failed to install dist packages" >&2
@@ -145,7 +155,7 @@ java_tests() {
local all_passed=true
for version in "${flink_versions[@]}"; do
echo "Running E2E tests for Flink ${version}..."
- mvn --batch-mode --no-transfer-progress test -pl
'e2e-test/flink-agents-end-to-end-tests-integration' -Pflink-${version}
+ mvn --batch-mode --no-transfer-progress test -pl
'e2e-test/flink-agents-end-to-end-tests-integration' -Pflink-${version}
${SPOTLESS_FLAG}
if [ $? -ne 0 ]; then
echo "E2E tests failed for Flink ${version}" >&2
@@ -159,7 +169,7 @@ java_tests() {
testcode=0
else
echo "Installing all modules (including test-jars) to local
repository..."
- mvn --batch-mode --no-transfer-progress test-compile jar:test-jar
install -DskipTests
+ mvn --batch-mode --no-transfer-progress test-compile jar:test-jar
install -DskipTests ${SPOTLESS_FLAG}
install_code=$?
if [ $install_code -ne 0 ]; then
echo "Failed to install modules to local repository" >&2
@@ -170,7 +180,7 @@ java_tests() {
exclude_list="!e2e-test/flink-agents-end-to-end-tests-integration,!e2e-test/flink-agents-end-to-end-tests-resource-cross-language"
- mvn -T16 --batch-mode --no-transfer-progress test -fae -pl
"${exclude_list}"
+ mvn -T16 --batch-mode --no-transfer-progress test -fae -pl
"${exclude_list}" ${SPOTLESS_FLAG}
testcode=$?
fi
case $testcode in
