Skip to content

Commit fe0eb5e

Browse files
Use musl based build for Linux binaries (#11)
1 parent 84c7687 commit fe0eb5e

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

.github/workflows/pr.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,17 @@ jobs:
2121
with:
2222
check-latest: true
2323
development: true
24-
swift-version: "5.10"
24+
swift-version: "6.1"
2525
- name: Run Linux Build
2626
if: matrix.os == 'ubuntu-latest'
2727
run: |
28-
swift build
28+
swift sdk install https://download.swift.org/swift-6.1-branch/static-sdk/swift-6.1-DEVELOPMENT-SNAPSHOT-2025-03-25-a/swift-6.1-DEVELOPMENT-SNAPSHOT-2025-03-25-a_static-linux-0.0.1.artifactbundle.tar.gz --checksum 2b73c30ec402f443857e6cd2ac06b8525f186e889a7a727af05601629148fe6a
29+
swift build --swift-sdk x86_64-swift-linux-musl
2930
mv ./.build/debug/SwiftAstGen SwiftAstGen-linux
3031
gzexe SwiftAstGen-linux
32+
swift build --swift-sdk aarch64-swift-linux-musl
33+
mv ./.build/debug/SwiftAstGen SwiftAstGen-linux-arm64
34+
gzexe SwiftAstGen-linux-arm64
3135
./SwiftAstGen-linux -s
3236
- name: Run Mac Build
3337
if: matrix.os == 'macos-latest'
@@ -56,8 +60,8 @@ jobs:
5660
if: matrix.os != 'windows-latest'
5761
uses: actions/setup-java@v4
5862
with:
59-
distribution: 'temurin'
60-
java-version: '19'
63+
distribution: temurin
64+
java-version: 21
6165
- name: Run Scala Tests
6266
run: sbt test
6367
working-directory: ./Tests/ScalaSwiftNodeSyntaxTests

.github/workflows/release.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,17 @@ jobs:
2626
with:
2727
check-latest: true
2828
development: true
29-
swift-version: "5.10"
29+
swift-version: "6.1"
3030
- name: Run Linux Build
3131
if: matrix.os == 'ubuntu-latest'
3232
run: |
33-
swift build -c release --arch arm64 --arch x86_64 --static-swift-stdlib
33+
swift sdk install https://download.swift.org/swift-6.1-branch/static-sdk/swift-6.1-DEVELOPMENT-SNAPSHOT-2025-03-25-a/swift-6.1-DEVELOPMENT-SNAPSHOT-2025-03-25-a_static-linux-0.0.1.artifactbundle.tar.gz --checksum 2b73c30ec402f443857e6cd2ac06b8525f186e889a7a727af05601629148fe6a
34+
swift build --swift-sdk x86_64-swift-linux-musl -c release --static-swift-stdlib
3435
mv ./.build/release/SwiftAstGen SwiftAstGen-linux
3536
gzexe SwiftAstGen-linux
37+
swift build --swift-sdk aarch64-swift-linux-musl -c release --static-swift-stdlib
38+
mv ./.build/release/SwiftAstGen SwiftAstGen-linux-arm64
39+
gzexe SwiftAstGen-linux-arm64
3640
./SwiftAstGen-linux -s
3741
- name: Run Mac Build
3842
if: matrix.os == 'macos-latest'
@@ -59,6 +63,7 @@ jobs:
5963
tag_name: ${{ github.ref_name }}
6064
files: |
6165
SwiftAstGen-linux
66+
SwiftAstGen-linux-arm64
6267
SwiftAstGen-mac
6368
SwiftAstGen-win.exe
6469
SwiftNodeSyntax.scala

Sources/SwiftAstGenLib/ScalaAstGenerator.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class ScalaAstGenerator {
4242
if FileManager.default.fileExists(atPath: defaultScalaOutFileUrl.path) {
4343
try FileManager.default.removeItem(at: defaultScalaOutFileUrl)
4444
}
45-
FileManager.default.createFile(
45+
_ = FileManager.default.createFile(
4646
atPath: defaultScalaOutFileUrl.path,
4747
contents: nil,
4848
attributes: nil

Tests/SwiftAstGenTests/TestUtils.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ extension TestUtils {
4040
withIntermediateDirectories: true,
4141
attributes: nil
4242
)
43-
FileManager.default.createFile(
43+
_ = FileManager.default.createFile(
4444
atPath: srcFile.path,
4545
contents: nil,
4646
attributes: nil

0 commit comments

Comments
 (0)