You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by ki...@apache.org on 2022/08/18 06:40:05 UTC

[incubator-seatunnel] branch st-engine updated: fix ci bug (#2454)

This is an automated email from the ASF dual-hosted git repository.

kirs pushed a commit to branch st-engine
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git


The following commit(s) were added to refs/heads/st-engine by this push:
     new a0eaa27f6 fix ci bug (#2454)
a0eaa27f6 is described below

commit a0eaa27f668bdf7619128f1022acd75f6101557d
Author: Eric <ga...@gmail.com>
AuthorDate: Thu Aug 18 14:40:00 2022 +0800

    fix ci bug (#2454)
    
    add -T to scalastyle check
    
    add -T to scalastyle check
---
 .github/workflows/engine_backend.yml |  9 ++---
 pom.xml                              |  1 +
 seatunnel-apis/pom.xml               |  2 --
 seatunnel-e2e/pom.xml                | 70 +++++++++++++++++++++++-------------
 seatunnel-examples/pom.xml           | 28 +++++++++++----
 seatunnel-transforms/pom.xml         | 26 +++++++++++---
 6 files changed, 94 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/engine_backend.yml b/.github/workflows/engine_backend.yml
index aa423f5b2..7bc593944 100644
--- a/.github/workflows/engine_backend.yml
+++ b/.github/workflows/engine_backend.yml
@@ -98,7 +98,7 @@ jobs:
           cache: 'maven'
       - name: Build distribution tar
         run: >-
-          ./mvnw -B install scalastyle:check
+          ./mvnw -B -T 1C install scalastyle:check
           -D"maven.test.skip"=true
           -D"checkstyle.skip"=true
           -D"license.skipAddThirdParty"=true
@@ -106,6 +106,7 @@ jobs:
           -D"maven.wagon.http.pool"=false
           -D"maven.wagon.http.retryHandler.count"=3
           -D"maven.wagon.httpconnectionManager.ttlSeconds"=120
+          -P engine-all
 
   dependency-license:
     if: github.repository == 'apache/incubator-seatunnel'
@@ -124,7 +125,7 @@ jobs:
           cache: 'maven'
       - name: Install
         run: >-
-          ./mvnw -B -q install -DskipTests
+          ./mvnw -B -T 1C -q install -DskipTests
           -D"maven.test.skip"=true
           -D"maven.javadoc.skip"=true
           -D"scalastyle.skip"=true
@@ -152,7 +153,7 @@ jobs:
           cache: 'maven'
       - name: Run Unit tests
         run: |
-          ./mvnw -B -T 1C clean verify -D"maven.test.skip"=false -D"checkstyle.skip"=true -D"scalastyle.skip"=true -D"license.skipAddThirdParty"=true --no-snapshot-updates -P engine_all
+          ./mvnw -B -T 1C clean verify -D"maven.test.skip"=false -D"checkstyle.skip"=true -D"scalastyle.skip"=true -D"license.skipAddThirdParty"=true --no-snapshot-updates -P engine-all
         env:
           MAVEN_OPTS: -Xmx2048m
 
@@ -175,6 +176,6 @@ jobs:
           cache: 'maven'
       - name: Run Integration tests
         run: |
-          ./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false -D"checkstyle.skip"=true -D"scalastyle.skip"=true -D"license.skipAddThirdParty"=true --no-snapshot-updates -P engine_all
+          ./mvnw -T 1C -B verify -DskipUT=true -DskipIT=false -D"checkstyle.skip"=true -D"scalastyle.skip"=true -D"license.skipAddThirdParty"=true --no-snapshot-updates -P engine-all
         env:
           MAVEN_OPTS: -Xmx2048m
diff --git a/pom.xml b/pom.xml
index 808549c49..9750e140e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,7 @@
             <modules>
                 <module>seatunnel-connectors-v2</module>
                 <module>seatunnel-connectors-v2-dist</module>
+                <module>seatunnel-transforms</module>
                 <module>seatunnel-examples</module>
                 <module>seatunnel-e2e</module>
             </modules>
diff --git a/seatunnel-apis/pom.xml b/seatunnel-apis/pom.xml
index f74018d27..c12ffda4a 100644
--- a/seatunnel-apis/pom.xml
+++ b/seatunnel-apis/pom.xml
@@ -28,11 +28,9 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>seatunnel-apis</artifactId>
     <packaging>pom</packaging>
-
     <modules>
         <module>seatunnel-api-base</module>
         <module>seatunnel-api-flink</module>
         <module>seatunnel-api-spark</module>
     </modules>
-
 </project>
diff --git a/seatunnel-e2e/pom.xml b/seatunnel-e2e/pom.xml
index 9f5e6882b..472f7b83f 100644
--- a/seatunnel-e2e/pom.xml
+++ b/seatunnel-e2e/pom.xml
@@ -26,31 +26,51 @@
     <artifactId>seatunnel-e2e</artifactId>
     <packaging>pom</packaging>
 
-    <modules>
-        <module>seatunnel-flink-e2e</module>
-        <module>seatunnel-spark-e2e</module>
-        <module>seatunnel-flink-connector-v2-e2e</module>
-        <module>seatunnel-spark-connector-v2-e2e</module>
-        <module>seatunnel-flink-sql-e2e</module>
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connectors-v2-dist</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connectors-spark-dist</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connectors-flink-dist</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
+    <profiles>
+        <profile>
+            <id>all</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>seatunnel-flink-e2e</module>
+                <module>seatunnel-spark-e2e</module>
+                <module>seatunnel-flink-connector-v2-e2e</module>
+                <module>seatunnel-spark-connector-v2-e2e</module>
+                <module>seatunnel-flink-sql-e2e</module>
+            </modules>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.seatunnel</groupId>
+                    <artifactId>seatunnel-connectors-v2-dist</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.seatunnel</groupId>
+                    <artifactId>seatunnel-connectors-spark-dist</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.seatunnel</groupId>
+                    <artifactId>seatunnel-connectors-flink-dist</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>engine-all</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.seatunnel</groupId>
+                    <artifactId>seatunnel-connectors-v2-dist</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>release</id>
+        </profile>
+    </profiles>
     <build>
         <plugins>
             <plugin>
diff --git a/seatunnel-examples/pom.xml b/seatunnel-examples/pom.xml
index 6025128c9..6a5dba663 100644
--- a/seatunnel-examples/pom.xml
+++ b/seatunnel-examples/pom.xml
@@ -29,13 +29,27 @@
 
     <artifactId>seatunnel-examples</artifactId>
     <packaging>pom</packaging>
-    <modules>
-        <module>seatunnel-flink-examples</module>
-        <module>seatunnel-spark-examples</module>
-        <module>seatunnel-flink-sql-examples</module>
-        <module>seatunnel-flink-connector-v2-example</module>
-        <module>seatunnel-spark-connector-v2-example</module>
-    </modules>
+    <profiles>
+        <profile>
+            <id>all</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>seatunnel-flink-examples</module>
+                <module>seatunnel-spark-examples</module>
+                <module>seatunnel-flink-sql-examples</module>
+                <module>seatunnel-flink-connector-v2-example</module>
+                <module>seatunnel-spark-connector-v2-example</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>engine-all</id>
+        </profile>
+        <profile>
+            <id>release</id>
+        </profile>
+    </profiles>
     <build>
         <plugins>
             <plugin>
diff --git a/seatunnel-transforms/pom.xml b/seatunnel-transforms/pom.xml
index d90b04dbe..ba381d217 100644
--- a/seatunnel-transforms/pom.xml
+++ b/seatunnel-transforms/pom.xml
@@ -30,9 +30,27 @@
     <artifactId>seatunnel-transforms</artifactId>
     <packaging>pom</packaging>
 
-    <modules>
-        <module>seatunnel-transforms-flink</module>
-        <module>seatunnel-transforms-spark</module>
-    </modules>
+    <profiles>
+        <profile>
+            <id>all</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>seatunnel-transforms-flink</module>
+                <module>seatunnel-transforms-spark</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>engine-all</id>
+        </profile>
+        <profile>
+            <id>release</id>
+            <modules>
+                <module>seatunnel-transforms-flink</module>
+                <module>seatunnel-transforms-spark</module>
+            </modules>
+        </profile>
+    </profiles>
 
 </project>