Skip to content

Commit 3c339b5

Browse files
jerry-024jerry-024
committed
fix
1 parent 35522ec commit 3c339b5

27 files changed

+252
-693
lines changed

‎.github/workflows/e2e-tests-flink-1.x-jdk11.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
distribution: 'temurin'
5454

5555
- name: Build Flink
56-
run: mvn -T 1C -B clean install -DskipTests -Pflink1,spark3 -pl paimon-e2e-tests -am -Pflink-${{ matrix.flink_version }},java11
56+
run: mvn -T 1C -B clean install -DskipTests -Ppaimon-faiss,flink1,spark3 -pl paimon-e2e-tests -am -Pflink-${{ matrix.flink_version }},java11
5757

5858
- name: Test Flink
5959
run: |
@@ -63,9 +63,9 @@ jobs:
6363
echo "JVM timezone is set to $jvm_timezone"
6464
profile="flink-${{ matrix.flink_version }}"
6565
if [ "${{ matrix.flink_version }}" = "${{ matrix.flink_version[-1] }}" ]; then
66-
mvn -T 1C -B test -Pflink1,spark3 -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pjava11
66+
mvn -T 1C -B test -Ppaimon-faiss,flink1,spark3 -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pjava11
6767
else
68-
mvn -T 1C -B test -Pflink1,spark3 -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -P${profile},java11
68+
mvn -T 1C -B test -Ppaimon-faiss,flink1,spark3 -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -P${profile},java11
6969
fi
7070
env:
7171
MAVEN_OPTS: -Xmx4096m

‎.github/workflows/e2e-tests-flink-1.x.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
distribution: 'temurin'
5757

5858
- name: Build Flink
59-
run: mvn -T 2C -B clean install -DskipTests -Pflink1,spark3 -pl paimon-e2e-tests -am -Pflink-${{ matrix.flink_version }}
59+
run: mvn -T 2C -B clean install -DskipTests -Ppaimon-faiss,flink1,spark3 -pl paimon-e2e-tests -am -Pflink-${{ matrix.flink_version }}
6060

6161
- name: Test Flink
6262
run: |
@@ -66,9 +66,9 @@ jobs:
6666
echo "JVM timezone is set to $jvm_timezone"
6767
profile="flink-${{ matrix.flink_version }}"
6868
if [ "${{ matrix.flink_version }}" = "${{ matrix.flink_version[-1] }}" ]; then
69-
mvn -T 1C -B test -Pflink1,spark3 -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone
69+
mvn -T 1C -B test -Ppaimon-faiss,flink1,spark3 -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone
7070
else
71-
mvn -T 1C -B test -Pflink1,spark3 -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -P${profile}
71+
mvn -T 1C -B test -Ppaimon-faiss,flink1,spark3 -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -P${profile}
7272
fi
7373
env:
7474
MAVEN_OPTS: -Xmx4096m

‎.github/workflows/e2e-tests-flink-2.x-jdk11.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353

5454
- name: Build Flink
5555
run: |
56-
mvn -T 2C -B clean install -DskipTests -Pflink2,spark3 -pl paimon-e2e-tests -am -Pflink-${{ matrix.flink_version }},java11
56+
mvn -T 2C -B clean install -DskipTests -Ppaimon-faiss,flink2,spark3 -pl paimon-e2e-tests -am -Pflink-${{ matrix.flink_version }},java11
5757
5858
- name: Test Flink
5959
run: |
@@ -63,9 +63,9 @@ jobs:
6363
echo "JVM timezone is set to $jvm_timezone"
6464
profile="flink-${{ matrix.flink_version }}"
6565
if [ "${{ matrix.flink_version }}" = "${{ matrix.flink_version[-1] }}" ]; then
66-
mvn -T 1C -B test -Pflink2,spark3 -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pjava11
66+
mvn -T 1C -B test -Ppaimon-faiss,flink2,spark3 -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -Pjava11
6767
else
68-
mvn -T 1C -B test -Pflink2,spark3 -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -P${profile},java11
68+
mvn -T 1C -B test -Ppaimon-faiss,flink2,spark3 -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone -P${profile},java11
6969
fi
7070
env:
7171
MAVEN_OPTS: -Xmx4096m

‎.github/workflows/utitcase-flink-1.x-jdk11.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
java-version: ${{ env.JDK_VERSION }}
4747
distribution: 'temurin'
4848
- name: Build Flink
49-
run: mvn -T 1C -B clean install -DskipTests -Pflink1,spark3
49+
run: mvn -T 1C -B clean install -DskipTests -Ppaimon-faiss,flink1,spark3
5050
- name: Test Flink
5151
run: |
5252
# run tests with random timezone to find out timezone related bugs
@@ -58,6 +58,6 @@ jobs:
5858
test_modules+="org.apache.paimon:paimon-flink-${suffix},"
5959
done
6060
test_modules="${test_modules%,}"
61-
mvn -T 1C -B test verify -Pflink1,spark3 -pl "${test_modules}" -Duser.timezone=$jvm_timezone
61+
mvn -T 1C -B test verify -Ppaimon-faiss,flink1,spark3 -pl "${test_modules}" -Duser.timezone=$jvm_timezone
6262
env:
6363
MAVEN_OPTS: -Xmx4096m

‎.github/workflows/utitcase-flink-1.x.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
run: |
5959
COMPILE_MODULE="org.apache.paimon:paimon-flink-${{ matrix.flink_version }}"
6060
echo "Start compiling modules: $COMPILE_MODULE"
61-
mvn -T 2C -B clean install -DskipTests -Pflink1,spark3 -pl "${COMPILE_MODULE}" -am
61+
mvn -T 2C -B clean install -DskipTests -Ppaimon-faiss,flink1,spark3 -pl "${COMPILE_MODULE}" -am
6262
6363
- name: Test Flink
6464
run: |
@@ -67,7 +67,7 @@ jobs:
6767
echo "JVM timezone is set to $jvm_timezone"
6868
TEST_MODULE="org.apache.paimon:paimon-flink-${{ matrix.flink_version }}"
6969
echo "Start testing module: $TEST_MODULE"
70-
mvn -T 2C -B test verify -Pflink1,spark3 -pl "${TEST_MODULE}" -Duser.timezone=$jvm_timezone
70+
mvn -T 2C -B test verify -Ppaimon-faiss,flink1,spark3 -pl "${TEST_MODULE}" -Duser.timezone=$jvm_timezone
7171
echo "All modules tested"
7272
env:
7373
MAVEN_OPTS: -Xmx4096m -XX:+UseG1GC -XX:CICompilerCount=2

‎.github/workflows/utitcase-flink-2.x-jdk11.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
- name: Build Flink
5050
run: |
51-
mvn -T 2C -B clean install -DskipTests -Pflink2,spark3
51+
mvn -T 2C -B clean install -DskipTests -Ppaimon-faiss,flink2,spark3
5252
5353
- name: Test Flink
5454
run: |
@@ -61,6 +61,6 @@ jobs:
6161
test_modules+="org.apache.paimon:paimon-flink-${suffix},"
6262
done
6363
test_modules="${test_modules%,}"
64-
mvn -T 2C -B test verify -Pflink2,spark3 -pl "${test_modules}" -Duser.timezone=$jvm_timezone
64+
mvn -T 2C -B test verify -Ppaimon-faiss,flink2,spark3 -pl "${test_modules}" -Duser.timezone=$jvm_timezone
6565
env:
6666
MAVEN_OPTS: -Xmx4096m

‎.github/workflows/utitcase-jdk11.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
java-version: ${{ env.JDK_VERSION }}
4545
distribution: 'temurin'
4646
- name: Build
47-
run: mvn -T 1C -B clean install -DskipTests -Pflink1,spark3,paimon-lucene
47+
run: mvn -T 1C -B clean install -DskipTests -Ppaimon-faiss,flink1,spark3,paimon-lucene
4848
- name: Test
4949
run: |
5050
# run tests with random timezone to find out timezone related bugs
@@ -56,6 +56,6 @@ jobs:
5656
test_modules+="!org.apache.paimon:paimon-spark-${suffix}_2.12,"
5757
done
5858
test_modules="${test_modules%,}"
59-
mvn -T 1C -B clean install -pl "${test_modules}" -Pflink1,spark3,paimon-lucene -Pskip-paimon-flink-tests -Duser.timezone=$jvm_timezone
59+
mvn -T 1C -B clean install -pl "${test_modules}" -Ppaimon-faiss,flink1,spark3,paimon-lucene -Pskip-paimon-flink-tests -Duser.timezone=$jvm_timezone
6060
env:
6161
MAVEN_OPTS: -Xmx4096m

‎.github/workflows/utitcase.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Build Others
5454
run: |
5555
echo "Start compiling modules"
56-
mvn -T 2C -B clean install -DskipTests -Pflink1,spark3
56+
mvn -T 2C -B clean install -DskipTests -Ppaimon-faiss,flink1,spark3
5757
5858
- name: Test Others
5959
timeout-minutes: 60

0 commit comments

Comments
 (0)