diff --git a/.github/workflows/checkstyle.yaml b/.github/workflows/checkstyle.yaml index 325ed71a6..f04e56d51 100644 --- a/.github/workflows/checkstyle.yaml +++ b/.github/workflows/checkstyle.yaml @@ -40,4 +40,4 @@ jobs: - name: Run java checkstyle run: - cd flink-doris-connector && mvn clean compile checkstyle:checkstyle \ No newline at end of file + cd flink-doris-connector && mvn clean checkstyle:checkstyle \ No newline at end of file diff --git a/.github/workflows/run-e2ecase.yml b/.github/workflows/run-e2ecase.yml index e6318f8f9..3e582c49d 100644 --- a/.github/workflows/run-e2ecase.yml +++ b/.github/workflows/run-e2ecase.yml @@ -40,5 +40,5 @@ jobs: - name: Run E2ECases run: | - cd flink-doris-connector && mvn test -Dtest="*E2ECase" -Dimage="apache/doris:doris-all-in-one-2.1.0" + cd flink-doris-connector && mvn clean test -Dtest="*E2ECase" -Dimage="apache/doris:doris-all-in-one-2.1.0" diff --git a/.github/workflows/run-itcase.yml b/.github/workflows/run-itcase.yml index b036e9326..a78da076b 100644 --- a/.github/workflows/run-itcase.yml +++ b/.github/workflows/run-itcase.yml @@ -40,9 +40,9 @@ jobs: - name: Run ITCases For 1.15 run: | - cd flink-doris-connector && mvn test -pl flink-doris-connector-1.15 -am -Dtest="*ITCase" -Dimage="apache/doris:doris-all-in-one-2.1.0" + cd flink-doris-connector && mvn clean test -pl flink-doris-connector-1.15 -am -Dtest="*ITCase" -Dimage="apache/doris:doris-all-in-one-2.1.0" - name: Run ITCases For 1.18 run: | - cd flink-doris-connector && mvn test -pl flink-doris-connector-1.18 -am -Dtest="*ITCase" -Dimage="apache/doris:doris-all-in-one-2.1.0" + cd flink-doris-connector && mvn clean test -pl flink-doris-connector-1.18 -am -Dtest="*ITCase" -Dimage="apache/doris:doris-all-in-one-2.1.0" diff --git a/.licenserc.yaml b/.licenserc.yaml index 27e1080ed..6d51f876c 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -12,6 +12,6 @@ header: - '.github/PULL_REQUEST_TEMPLATE.md' - '.licenserc.yaml' - 'custom_env.sh.tpl' - - 'flink-doris-connector/src/test/resources/container/' + - 'flink-doris-connector/flink-doris-connector-common/src/test/resources/container/' comment: on-failure diff --git a/flink-doris-connector/build.sh b/flink-doris-connector/build.sh index 4852553b5..c4d070dba 100755 --- a/flink-doris-connector/build.sh +++ b/flink-doris-connector/build.sh @@ -151,7 +151,6 @@ flinkVer=$? FLINK_PYTHON_ID="flink-python" if [ ${flinkVer} -eq 1 ]; then FLINK_VERSION="1.15.0" - FLINK_PYTHON_ID="flink-python_2.12" elif [ ${flinkVer} -eq 2 ]; then FLINK_VERSION="1.16.0" elif [ ${flinkVer} -eq 3 ]; then @@ -172,7 +171,7 @@ FLINK_MAJOR_VERSION=0 echo_g " flink version: ${FLINK_VERSION}, major version: ${FLINK_MAJOR_VERSION}" echo_g " build starting..." -${MVN_BIN} clean package -Dflink.version=${FLINK_VERSION} -Dflink.major.version=${FLINK_MAJOR_VERSION} -Dflink.python.id=${FLINK_PYTHON_ID} "$@" +${MVN_BIN} clean install -pl flink-doris-connector-${FLINK_MAJOR_VERSION} -am "$@" EXIT_CODE=$? if [ $EXIT_CODE -eq 0 ]; then