From 7492dc9783836facf3d10f76433fae63d80e95cb Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 17 Jul 2026 00:54:44 -0400
Subject: [PATCH] Test against sbt 1.x build

---
 .github/workflows/client-test.yml              | 18 +++++++++++++++---
 .../java/sbt/internal/BootServerSocket.java    |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/client-test.yml b/.github/workflows/client-test.yml
index 40c6e9d3f..26a4797bb 100644
--- a/.github/workflows/client-test.yml
+++ b/.github/workflows/client-test.yml
@@ -86,13 +86,25 @@ jobs:
         command: |
           # test building sbtn on Windows (sbtw native-image dropped: scopt lazy vals break under Graal)
           sbt "-Dsbt.io.virtual=false" nativeImage
+    - name: sbtn test (Windows)
+      if: ${{ matrix.os == 'windows-latest' }}
+      shell: bash
+      run: |
+        REPO_ROOT=$(pwd)
+        set -o xtrace
+        # smoke test native Image (sbtn)
+        $REPO_ROOT/client/target/bin/sbtn --sbt-script=$REPO_ROOT/launcher-package/src/universal/bin/sbt.bat about
+        $REPO_ROOT/client/target/bin/sbtn --sbt-script=$REPO_ROOT/launcher-package/src/universal/bin/sbt.bat shutdown
+        pushd launcher-package/citest
+        # smoke test native Image (sbtn) against sbt 1.x build
+        $REPO_ROOT/client/target/bin/sbtn --sbt-script=$REPO_ROOT/launcher-package/src/universal/bin/sbt.bat about > out.txt
+        grep -q "Available Plugins" out.txt
+        $REPO_ROOT/client/target/bin/sbtn --sbt-script=$REPO_ROOT/launcher-package/src/universal/bin/sbt.bat shutdown
+        popd
     - name: Client test (Windows)
       if: ${{ matrix.os == 'windows-latest' }}
       shell: bash
       run: |
-        # smoke test native Image (sbtn)
-        ./client/target/bin/sbtn --sbt-script=$(pwd)/launcher-package/src/universal/bin/sbt.bat about
-        ./client/target/bin/sbtn --sbt-script=$(pwd)/launcher-package/src/universal/bin/sbt.bat shutdown
         # test launcher script
         echo build using JDK 17 test using JDK 17 and JDK 25
         launcher-package/bin/coursier.bat resolve
diff --git a/main-command/src/main/java/sbt/internal/BootServerSocket.java b/main-command/src/main/java/sbt/internal/BootServerSocket.java
index b608d294d..615e03792 100644
--- a/main-command/src/main/java/sbt/internal/BootServerSocket.java
+++ b/main-command/src/main/java/sbt/internal/BootServerSocket.java
@@ -301,7 +301,7 @@ public class BootServerSocket implements AutoCloseable {
   }
 
   public static String namedPipeLocation(final long farmHash) {
-    return "\\\\.\\pipe\\sbt-load" + farmHash;
+    return "sbt-load" + farmHash;
   }
 
   @SuppressWarnings("EmptyCatchBlock")