Applying PR suggestions

snowflakedb · Jun 12, 2024 · 99a2167 · 99a2167
1 parent ce82956
commit 99a2167
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 9 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -43,7 +43,7 @@ jobs:
 
     test-windows:
         needs: build
-        name: ${{ matrix.cloud }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category }} / Test on Windows(java ${{ matrix.javaVersion }}, ${{ matrix.cloud }} )
+        name: ${{ matrix.cloud }} Windows java ${{ matrix.javaVersion }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category }}
         runs-on: windows-latest
         strategy:
             fail-fast: false
@@ -79,7 +79,7 @@ jobs:
 
     test-mac:
         needs: build
-        name: ${{ matrix.cloud }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category }} / Test on Mac(java ${{ matrix.javaVersion }}, ${{ matrix.cloud }} )
+        name: ${{ matrix.cloud }} Mac java ${{ matrix.javaVersion }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category }}
         runs-on: macos-13
         strategy:
             fail-fast: false
@@ -112,7 +112,7 @@ jobs:
 
     test-linux:
         needs: build
-        name: ${{ matrix.cloud }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category }} on ${{ matrix.image }}
+        name: ${{ matrix.cloud }} Linux java on ${{ matrix.image }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category }}
         runs-on: ubuntu-latest
         strategy:
             fail-fast: false

diff --git a/FIPS/src/test/java/net/snowflake/client/RunningOnWinMac.java b/FIPS/src/test/java/net/snowflake/client/RunningOnWinMac.java
diff --git a/ci/test_windows.bat b/ci/test_windows.bat
@@ -3,7 +3,6 @@ REM Tests JDBC Driver on Windows
 REM
 setlocal
 setlocal EnableDelayedExpansion
-set TIMEOUT=90000
 python -m venv venv
 call venv\scripts\activate
 pip install -U snowflake-connector-python
@@ -53,11 +52,6 @@ pushd %GITHUB_WORKSPACE%\ci\container
 python create_schema.py
 popd
 
-echo [INFO] Installing Snowflake JDBC Driver
-copy %GITHUB_WORKSPACE%\artifacts\* .
-
-REM add steps to jdbc driver
-
 REM setup log
 
 set CLIENT_LOG_DIR_PATH=%GITHUB_WORKSPACE%\jenkins_rt_logs

diff --git a/pom.xml b/pom.xml
@@ -1203,6 +1203,42 @@
         <os>
           <family>!windows</family>
         </os>
+        <property>
+          <name>!thin-jar</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>${version.plugin.exec}</version>
+            <executions>
+              <execution>
+                <id>check-shaded-content</id>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <phase>verify</phase>
+                <configuration>
+                  <executable>${basedir}/ci/scripts/check_content.sh</executable>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>check-content-thin</id>
+      <activation>
+        <os>
+          <family>!windows</family>
+        </os>
+        <property>
+          <name>thin-jar</name>
+        </property>
       </activation>
       <build>
         <plugins>
@@ -1219,6 +1255,9 @@
                 <phase>verify</phase>
                 <configuration>
                   <executable>${basedir}/ci/scripts/check_content.sh</executable>
+                  <arguments>
+                    <argument>-thin</argument>
+                  </arguments>
                 </configuration>
               </execution>
             </executions>