Skip to content

Commit 20880e8

Browse files
committed
Dont throw error if we have output
1 parent 798bbec commit 20880e8

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

__tests__/get-version.test.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ describe("version lookup", () => {
88
expect(version).toBe("5.4.2");
99
});
1010

11+
it("identifies version from swift version with target", async () => {
12+
const version = versionFromString(
13+
`Apple Swift version 5.5 (swiftlang-1300.0.31.1 clang-1300.0.29.1)
14+
Target: x86_64-apple-macosx11.0`
15+
);
16+
expect(version).toBe("5.5");
17+
});
18+
1119
it("identifies version from swift-driver version", async () => {
1220
const version = versionFromString(
1321
"swift-driver version: 1.26.9 Apple Swift version 5.5 (swiftlang-1300.0.31.1 clang-1300.0.29.1)"

src/get-version.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ export async function getVersion(
2020

2121
await exec(command, args, options);
2222

23-
if (error) {
24-
throw new Error(error);
23+
if (!output && error) {
24+
throw new Error("Error getting swift version " + error);
2525
}
2626

2727
return versionFromString(output);

0 commit comments

Comments
 (0)