This is an automated email from the ASF dual-hosted git repository. jark pushed a commit to branch ci-flink-2.1 in repository https://gitbox.apache.org/repos/asf/fluss.git
commit 95b0942b5b8b5b12d74c115e70e6056303c100e2 Author: Jark Wu <[email protected]> AuthorDate: Sat Aug 23 16:37:26 2025 +0800 test --- .github/workflows/ci-template.yaml | 5 ++-- .github/workflows/ci.yaml | 4 +--- .github/workflows/stage.sh | 47 +++++--------------------------------- pom.xml | 1 + 4 files changed, 10 insertions(+), 47 deletions(-) diff --git a/.github/workflows/ci-template.yaml b/.github/workflows/ci-template.yaml index 82aa88a95..26c81ab59 100644 --- a/.github/workflows/ci-template.yaml +++ b/.github/workflows/ci-template.yaml @@ -48,12 +48,11 @@ jobs: distribution: 'temurin' - name: Build run: | - TEST_MODULES=$(./.github/workflows/stage.sh all ${{ inputs.java-version }}) - mvn -T 1C -B clean install $TEST_MODULES -DskipTests ${{ inputs.maven-parameters }} + mvn -T 1C -B clean install -DskipTests ${{ inputs.maven-parameters }} - name: Test timeout-minutes: 60 run: | - TEST_MODULES=$(./.github/workflows/stage.sh ${{ matrix.module }} ${{ inputs.java-version }}) + TEST_MODULES=$(./.github/workflows/stage.sh ${{ matrix.module }}) echo "github ref: ${{ github.ref }}" echo "Start testing modules: $TEST_MODULES" mvn -B verify $TEST_MODULES -Ptest-coverage -Ptest-${{ matrix.module }} -Dlog.dir=${{ runner.temp }}/fluss-logs -Dlog4j.configurationFile=${{ github.workspace }}/tools/ci/log4j.properties ${{ inputs.maven-parameters }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fb9685226..54ce0d077 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -48,9 +48,7 @@ jobs: distribution: 'temurin' - name: Build run: | - TEST_MODULES=$(./.github/workflows/stage.sh all 8) - mvn -T 1C -B clean install -DskipTests -Pjava8 $TEST_MODULES - + mvn -T 1C -B clean install -DskipTests -Pjava8 build-on-jdk11: name: "Java 11" diff --git a/.github/workflows/stage.sh b/.github/workflows/stage.sh index be6154e61..f2d39e35e 100755 --- a/.github/workflows/stage.sh +++ b/.github/workflows/stage.sh @@ -23,65 +23,30 @@ STAGE_FLINK="flink" MODULES_FLINK="\ fluss-flink,\ fluss-flink/fluss-flink-common,\ -fluss-flink/fluss-flink-1.20,\ fluss-flink/fluss-flink-2.1,\ +fluss-flink/fluss-flink-1.20,\ fluss-flink/fluss-flink-1.19,\ fluss-flink/fluss-flink-1.18,\ fluss-lake,\ fluss-lake/fluss-lake-paimon,\ fluss-lake/fluss-lake-iceberg,\ -fluss-lake/fluss-lake-lance\ +fluss-lake/fluss-lake-lance " -# modules that are only built with JDK 11 -JDK_11_ONLY="fluss-flink/fluss-flink-2.1,fluss-test-coverage" - function get_test_modules_for_stage() { local stage=$1 - local jdk_version=$2 local modules_flink=$MODULES_FLINK - - - local included_modules="" - local excluded_modules="" + local modules_core=\!${MODULES_FLINK//,/,\!} case ${stage} in (${STAGE_CORE}) - # For core, we exclude all flink modules - excluded_modules="$modules_flink"; + echo "-pl $modules_core" ;; (${STAGE_FLINK}) - included_modules="fluss-test-coverage,$modules_flink" + echo "-pl fluss-test-coverage,$modules_flink" ;; esac - - # Add JDK 11 only modules to exclusion list if we're using JDK 8 - if [[ "$jdk_version" == "8" ]]; then - if [[ -n "$excluded_modules" ]]; then - excluded_modules="$excluded_modules,$JDK_11_ONLY" - else - excluded_modules="$JDK_11_ONLY" - fi - fi - - local result="$included_modules" - if [[ -n "$excluded_modules" ]]; then - if [[ -n "$result" ]]; then - result="$result,\!${excluded_modules//,/,\!}" - else - result=\!${excluded_modules//,/,\!} - fi - fi - - - if [[ -n "$result" ]]; then - echo "-pl $result" - else - # If both included_modules and excluded_modules are empty, - # don't specify any module restrictions (build all modules) - echo "" - fi } -get_test_modules_for_stage $1 $2 +get_test_modules_for_stage $1 diff --git a/pom.xml b/pom.xml index c033ea79b..c89eadd43 100644 --- a/pom.xml +++ b/pom.xml @@ -467,6 +467,7 @@ </plugins> </build> </profile> + <profile> <id>test-coverage</id> <properties>
