Skip to content

Commit 63a8478

Browse files
edburnsCopilot
andcommitted
Fix Java builds with scoped npm registries on macOS
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent a550258 commit 63a8478

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

java/sdk/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@
201201
<workingDirectory>${copilot.sdk.root}/test/harness</workingDirectory>
202202
<arguments>
203203
<argument>ci</argument>
204+
<argument>--omit-lockfile-registry-resolved=true</argument>
204205
<argument>--loglevel</argument>
205206
<argument>${npm.loglevel}</argument>
206207
</arguments>
@@ -225,6 +226,7 @@
225226
<arguments>
226227
<argument>ci</argument>
227228
<argument>--ignore-scripts</argument>
229+
<argument>--omit-lockfile-registry-resolved=true</argument>
228230
<argument>--loglevel</argument>
229231
<argument>${npm.loglevel}</argument>
230232
</arguments>

java/sdk/src/test/java/com/github/copilot/CliServerManagerTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,8 @@ void connectToServerTcpMode() throws Exception {
7272

7373
private static Process startBlockingProcess() throws IOException {
7474
boolean isWindows = System.getProperty("os.name").toLowerCase().contains("windows");
75-
return (isWindows
76-
? new ProcessBuilder(System.getenv("COMSPEC"), "/c", "more")
77-
: new ProcessBuilder("/usr/bin/cat")).start();
75+
return (isWindows ? new ProcessBuilder(System.getenv("COMSPEC"), "/c", "more") : new ProcessBuilder("cat"))
76+
.start();
7877
}
7978

8079
@Test

java/sdk/src/test/java/com/github/copilot/JsonRpcClientTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,8 @@ void testIsConnectedWithSocketClosed() throws Exception {
135135

136136
private static Process startBlockingProcess() throws IOException {
137137
boolean isWindows = System.getProperty("os.name").toLowerCase().contains("windows");
138-
return (isWindows
139-
? new ProcessBuilder(System.getenv("COMSPEC"), "/c", "more")
140-
: new ProcessBuilder("/usr/bin/cat")).start();
138+
return (isWindows ? new ProcessBuilder(System.getenv("COMSPEC"), "/c", "more") : new ProcessBuilder("cat"))
139+
.start();
141140
}
142141

143142
@Test

0 commit comments

Comments
 (0)