From e39650efff1db5332373a82872f4c9898ba8340f Mon Sep 17 00:00:00 2001
From: WEI Xikai <ShiKaiWi@users.noreply.github.com>
Date: Tue, 13 Sep 2022 15:25:36 +0800
Subject: [PATCH] chore: fix submodule init (#244)

* chore: make ci checkout with submodules

* chore: avoid clone submodule manually

* chore: set submodules as true

* chore: avoid generate test coverage file

* chore: remove result.json from gitignore
---
 .github/workflows/ci.yml                 | 9 ++++-----
 .github/workflows/docker-build-image.yml | 2 ++
 Makefile                                 | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 85572d2040..6fe2f8d19f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,8 +42,8 @@ jobs:
         rust: [nightly-2022-08-08]
     steps:
       - uses: actions/checkout@v3
-        # with:
-        #   submodules: true
+        with:
+          submodules: true
       - run: |
           rustup set auto-self-update disable
           rustup toolchain install ${{ matrix.rust }} --profile minimal
@@ -82,8 +82,8 @@ jobs:
         rust: [nightly-2022-08-08]
     steps:
       - uses: actions/checkout@v3
-        # with:
-        #   submodule: true
+        with:
+          submodules: true
       - run: |
           rustup set auto-self-update disable
           rustup toolchain install ${{ matrix.rust }} --profile minimal
@@ -105,7 +105,6 @@ jobs:
       - name: Run Tests
         run: |
           cp ${LOCK_FILE} ${LOCK_FILE}.bak
-          git clone https://github.com/apache/parquet-testing.git components/parquet-testing
           make test-ut
           echo "Checking if ${LOCK_FILE} has changed..."
           diff ${LOCK_FILE} ${LOCK_FILE}.bak
diff --git a/.github/workflows/docker-build-image.yml b/.github/workflows/docker-build-image.yml
index 142ae878d1..d65e49483e 100644
--- a/.github/workflows/docker-build-image.yml
+++ b/.github/workflows/docker-build-image.yml
@@ -8,6 +8,8 @@ on:
       - 'Dockerfile'
       - 'docker/**'
   push:
+    branches:
+      - main
     paths:
       - '.github/workflows/docker-build-image.yml'
       - 'Dockerfile'
diff --git a/Makefile b/Makefile
index 5038a66df2..a50885a2df 100644
--- a/Makefile
+++ b/Makefile
@@ -33,9 +33,9 @@ test-ut:
 	echo $(CARGO_INCREMENTAL)
 	echo $(RUSTFLAGS)
 	echo $(RUSTDOCFLAGS)
-#	cd $(DIR); cargo test --workspace -- -Z unstable-options --format json | tee results.json; \
-# 	cat results.json | cargo2junit > ${WORKSPACE}/testresult/TEST-all.xml
-	cd $(DIR); cargo test --workspace
+	#cd $(DIR); cargo test --workspace -- -Z unstable-options --format json | tee results.json; \
+ 	#cat results.json | cargo2junit > ${WORKSPACE}/testresult/TEST-all.xml
+	cargo test --workspace
 
 fmt:
 	cd $(DIR); cargo fmt -- --check