fix: MacOS and Windows test runs for useragent

spiceai · Oct 4, 2024 · e52550f · e52550f
1 parent 9297bd8
commit e52550f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -33,8 +33,13 @@ jobs:
     - name: Display Maven version
       run: mvn -version
 
-    - name: Build
+    - name: Build (Unix)
+      if: matrix.os != 'windows-latest'
       run: mvn install -DskipTests=true -Dgpg.skip -B -V
+
+    - name: Build (Windows)
+      if: matrix.os == 'windows-latest'
+      run: mvn --% install -DskipTests=true -Dgpg.skip -B -V # tell powershell to stop parsing with --% so it doesn't error with "Unknown lifecycle phase .skip"
 
     - name: Install Spice (https://install.spiceai.org) (Linux)
       if: matrix.os == 'ubuntu-latest'

diff --git a/src/main/java/ai/spice/Config.java b/src/main/java/ai/spice/Config.java
@@ -108,7 +108,13 @@ public static String getUserAgent() {
             osArch = "i386";
         }
 
-        return "spice-java " + Version.SPICE_JAVA_VERSION + " (" + System.getProperty("os.name") + "/"
+        // change the os name to match the pattern set in other SDKs
+        String osName = System.getProperty("os.name");
+        if (osName.equals("Mac OS X")) {
+            osName = "Darwin";
+        }
+
+        return "spice-java " + Version.SPICE_JAVA_VERSION + " (" + osName + "/"
                 + System.getProperty("os.version") + " "
                 + osArch + ")";
     }