From 0e1601cf69e34fd473c42281617b761838a467a7 Mon Sep 17 00:00:00 2001 From: xwm1992 Date: Mon, 6 Nov 2023 17:36:24 +0800 Subject: [PATCH 1/6] fix ci check error --- .github/workflows/ci.yml | 7 ++++++- .../{transform => transformer}/TransformTest.java | 6 +----- 2 files changed, 7 insertions(+), 6 deletions(-) rename eventmesh-transformer/src/test/java/org/apache/eventmesh/{transform => transformer}/TransformTest.java (96%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 310551f572..e9f21c3c9b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,11 @@ jobs: # queries: ./path/to/local/query, your-org/your-repo/queries@main languages: ${{ matrix.language }} + - if: matrix.language == 'cpp' || matrix.language == 'csharp' + name: Build C + run: | + make + - name: Cache Gradle packages uses: actions/cache@v3 with: @@ -100,4 +105,4 @@ jobs: - name: Check third party dependencies run: | - ./gradlew clean jar dist -x spotlessJava -x test -x checkstyleMain -x javaDoc && ./gradlew installPlugin && ./gradlew tar && sh tools/dependency-check/check-dependencies.sh && echo "Thirty party dependencies check success" + ./gradlew clean jar dist -x spotlessJava -x test -x checkstyleMain -x javaDoc && ./gradlew installPlugin && ./gradlew tar && sh tools/dependency-check/check-dependencies.sh && echo "Thirty party dependencies check success" \ No newline at end of file diff --git a/eventmesh-transformer/src/test/java/org/apache/eventmesh/transform/TransformTest.java b/eventmesh-transformer/src/test/java/org/apache/eventmesh/transformer/TransformTest.java similarity index 96% rename from eventmesh-transformer/src/test/java/org/apache/eventmesh/transform/TransformTest.java rename to eventmesh-transformer/src/test/java/org/apache/eventmesh/transformer/TransformTest.java index b17460a410..2127e50edc 100644 --- a/eventmesh-transformer/src/test/java/org/apache/eventmesh/transform/TransformTest.java +++ b/eventmesh-transformer/src/test/java/org/apache/eventmesh/transformer/TransformTest.java @@ -15,11 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.transform; - -import org.apache.eventmesh.transformer.Transformer; -import org.apache.eventmesh.transformer.TransformerBuilder; -import org.apache.eventmesh.transformer.TransformerType; +package org.apache.eventmesh.transformer; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; From d0582a2a7bb5ebc7b68b4d432b4921575f899c09 Mon Sep 17 00:00:00 2001 From: mike_xwm Date: Tue, 7 Nov 2023 17:59:26 +0800 Subject: [PATCH 2/6] Update ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9f21c3c9b..90d9001b84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,6 +33,7 @@ jobs: matrix: os: [ ubuntu-latest, macOS-latest ] java: [ 8, 11 ] + language: ['java', 'go', 'c'] runs-on: ${{ matrix.os }} steps: @@ -105,4 +106,4 @@ jobs: - name: Check third party dependencies run: | - ./gradlew clean jar dist -x spotlessJava -x test -x checkstyleMain -x javaDoc && ./gradlew installPlugin && ./gradlew tar && sh tools/dependency-check/check-dependencies.sh && echo "Thirty party dependencies check success" \ No newline at end of file + ./gradlew clean jar dist -x spotlessJava -x test -x checkstyleMain -x javaDoc && ./gradlew installPlugin && ./gradlew tar && sh tools/dependency-check/check-dependencies.sh && echo "Thirty party dependencies check success" From 374ee1327a9f79e312c234119ed9d3bb816ce178 Mon Sep 17 00:00:00 2001 From: mike_xwm Date: Tue, 7 Nov 2023 19:13:53 +0800 Subject: [PATCH 3/6] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90d9001b84..2046a04166 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: matrix: os: [ ubuntu-latest, macOS-latest ] java: [ 8, 11 ] - language: ['java', 'go', 'c'] + language: ['java', 'go', 'cpp'] runs-on: ${{ matrix.os }} steps: From 021aaed11fb7dc59f1e334e9fc9128be1204e148 Mon Sep 17 00:00:00 2001 From: mike_xwm Date: Tue, 7 Nov 2023 20:30:42 +0800 Subject: [PATCH 4/6] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2046a04166..2fdf0232c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: - if: matrix.language == 'cpp' || matrix.language == 'csharp' name: Build C run: | - make + make -C ./eventmesh-sdks/eventmesh-sdk-c - name: Cache Gradle packages uses: actions/cache@v3 From a613bca0eda2e2183e9fa377edccc8c0732e8422 Mon Sep 17 00:00:00 2001 From: mike_xwm Date: Wed, 8 Nov 2023 10:53:41 +0800 Subject: [PATCH 5/6] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2fdf0232c0..c70f93c80f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,6 +52,8 @@ jobs: - if: matrix.language == 'cpp' || matrix.language == 'csharp' name: Build C run: | + git submodule init + git submodule update make -C ./eventmesh-sdks/eventmesh-sdk-c - name: Cache Gradle packages From 53715a6ec535bd4515bb8d6d4c2edab77c156c55 Mon Sep 17 00:00:00 2001 From: mike_xwm Date: Wed, 8 Nov 2023 11:30:10 +0800 Subject: [PATCH 6/6] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c70f93c80f..4182ffa9fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: matrix: os: [ ubuntu-latest, macOS-latest ] java: [ 8, 11 ] - language: ['java', 'go', 'cpp'] + language: ['java', 'go'] runs-on: ${{ matrix.os }} steps: