Merge remote-tracking branch 'origin/main' into SNOW-1692380-release-…

…pipeline # Conflicts: # pom.xml
snowflakedb · Oct 21, 2024 · 143ca86 · 143ca86
2 parents ef511bd + e43f7ac
commit 143ca86
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -73,6 +73,10 @@ jobs:
           TEST_GROUPS: ${{ matrix.runConfig.testGroups }}
           JDBC_VERSION: ${{ matrix.runConfig.jdbcVersion }}
         run: ci\\test_windows.bat
+      - uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   test-mac:
     needs: build
@@ -113,6 +117,10 @@ jobs:
           TEST_GROUPS: ${{ matrix.runConfig.testGroups }}
           JDBC_VERSION: ${{ matrix.runConfig.jdbcVersion }}
         run: bash ./ci/test.sh
+      - uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   test-linux:
     needs: build
@@ -150,3 +158,7 @@ jobs:
           TEST_GROUPS: ${{ matrix.runConfig.testGroups }}
           JDBC_VERSION: ${{ matrix.runConfig.jdbcVersion }}
         run: ./ci/test.sh
+      - uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/README.md b/README.md
@@ -3,6 +3,8 @@
 [<img src="https://github.com/snowflakedb/snowflake-hibernate/actions/workflows/build-test.yml/badge.svg?branch=main">](https://github.com/snowflakedb/snowflake-hibernate/actions/workflows/build-test.yml?query=branch%3Amain)
 [<img src="http://img.shields.io/:license-Apache--2.0-brightgreen.svg">](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
+[![codecov](https://codecov.io/gh/snowflakedb/snowflake-hibernate/graph/badge.svg?token=J8TOYZ6SZK)](https://codecov.io/gh/snowflakedb/snowflake-hibernate)
+
 ## Brief
 
 This project is an SQL dialect definition for Hibernate Core enabling Java developers to reuse ORM features with Snowflake database.

diff --git a/pom.xml b/pom.xml
@@ -37,6 +37,7 @@
 
         <fmt-maven-plugin.version>2.24</fmt-maven-plugin.version>
         <hibernate-core.version>6.4.4.Final</hibernate-core.version>
+        <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
         <junit-jupiter-engine.version>5.10.2</junit-jupiter-engine.version>
         <junit-jupiter-params.version>5.10.2</junit-jupiter-params.version>
         <log4j-slf4j2-impl.version>2.23.0</log4j-slf4j2-impl.version>
@@ -149,7 +150,7 @@
                 <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <groups>${testGroups}</groups>
-                    <argLine>--add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</argLine>
+                    <argLine>${argLine} --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</argLine>
                 </configuration>
             </plugin>
             <plugin>
@@ -158,7 +159,7 @@
                 <version>${maven-failsafe-plugin.version}</version>
                 <configuration>
                     <groups>${testGroups}</groups>
-                    <argLine>--add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</argLine>
+                    <argLine>${argLine} --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED</argLine>
                 </configuration>
             </plugin>
             <plugin>
@@ -221,6 +222,33 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>pre-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>target/jacoco-tests.exec</destFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>post-test</id>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <phase>test</phase>
+                        <configuration>
+                            <dataFile>target/jacoco-tests.exec</dataFile>
+                            <outputDirectory>target/jacoco-tests</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>