Skip to content

Commit a0829bf

Browse files
committed
Merge branch 'main' of https://github.com/swiftlang/swiftly into adopt_subprocess
2 parents 48c1b25 + 91f1228 commit a0829bf

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

Package.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ let package = Package(
141141
.product(name: "ArgumentParser", package: "swift-argument-parser"),
142142
.product(name: "_NIOFileSystem", package: "swift-nio"),
143143
],
144-
path: "Tools/build-swiftly-release"
144+
path: "Tools/build-swiftly-release",
145+
exclude: ["musl-clang"],
145146
),
146147
.target(
147148
name: "LinuxPlatform",

Sources/LinuxPlatform/Linux.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,15 @@ public struct Linux: Platform {
9898
"tzdata",
9999
"git",
100100
"unzip",
101+
"zip",
101102
"pkg-config",
102103
]
103104
case "ubuntu2004":
104105
[
105106
"binutils",
106107
"git",
107108
"unzip",
109+
"zip",
108110
"gnupg2",
109111
"libc6-dev",
110112
"libcurl4-openssl-dev",
@@ -124,6 +126,7 @@ public struct Linux: Platform {
124126
"binutils",
125127
"git",
126128
"unzip",
129+
"zip",
127130
"gnupg2",
128131
"libc6-dev",
129132
"libcurl4-openssl-dev",
@@ -144,6 +147,7 @@ public struct Linux: Platform {
144147
"binutils",
145148
"git",
146149
"unzip",
150+
"zip",
147151
"gnupg2",
148152
"libc6-dev",
149153
"libcurl4-openssl-dev",
@@ -165,6 +169,7 @@ public struct Linux: Platform {
165169
"gcc",
166170
"git",
167171
"unzip",
172+
"zip",
168173
"glibc-static",
169174
"gzip",
170175
"libbsd",
@@ -201,6 +206,7 @@ public struct Linux: Platform {
201206
"gcc",
202207
"git",
203208
"unzip",
209+
"zip",
204210
"libcurl-devel",
205211
"libedit-devel",
206212
"libicu-devel",
@@ -227,6 +233,8 @@ public struct Linux: Platform {
227233
"git",
228234
"gcc",
229235
"libstdc++-12-dev",
236+
"unzip",
237+
"zip",
230238
]
231239
default:
232240
[]

0 commit comments

Comments
 (0)