|
30 | 30 | "dart": dartBuild,
|
31 | 31 | }
|
32 | 32 | sema = make(chan struct{}, 5)
|
| 33 | + // defaultExclude is the default exclude for all builds to prevent |
| 34 | + // unneccessary architecture support files from being copied into the |
| 35 | + // build directory |
| 36 | + defaultExclude = []string{"**/*.rlib", "**/*.a", "**/*.d", "*musl*", "*iOS*", "*Android*", "*wasm*"} |
33 | 37 | )
|
34 | 38 |
|
35 | 39 | func init() {
|
@@ -249,16 +253,13 @@ func goBuild(ctx context.Context, client *dagger.Client, hostDirectory *dagger.D
|
249 | 253 | WithWorkdir("/src").
|
250 | 254 | WithFile("/tmp/ext/flipt_engine.h", hostDirectory.File("flipt-engine-ffi/include/flipt_engine.h"))
|
251 | 255 |
|
252 |
| - defaultExclude := []string{"*.rlib"} |
253 |
| - |
254 | 256 | if buildOpts.libc == glibc {
|
255 |
| - exclude := append(defaultExclude, "*_musl") |
256 | 257 | repository = repository.
|
257 |
| - WithDirectory("/tmp/ext", hostDirectory.Directory("tmp"), dagger.ContainerWithDirectoryOpts{Exclude: exclude}) |
| 258 | + WithDirectory("/tmp/ext", hostDirectory.Directory("tmp"), dagger.ContainerWithDirectoryOpts{Exclude: defaultExclude}) |
258 | 259 | } else {
|
259 | 260 | repository = repository.
|
260 |
| - WithDirectory("/tmp/ext/linux_arm64", hostDirectory.Directory("tmp/linux_arm64_musl"), dagger.ContainerWithDirectoryOpts{Exclude: defaultExclude}). |
261 |
| - WithDirectory("/tmp/ext/linux_x86_64", hostDirectory.Directory("tmp/linux_x86_64_musl"), dagger.ContainerWithDirectoryOpts{Exclude: defaultExclude}) |
| 261 | + WithDirectory("/tmp/ext/linux_arm64", hostDirectory.Directory("tmp/linux_arm64_musl"), dagger.ContainerWithDirectoryOpts{Exclude: []string{"**/*.rlib", "**/*.a", "**/*.d"}}). |
| 262 | + WithDirectory("/tmp/ext/linux_x86_64", hostDirectory.Directory("tmp/linux_x86_64_musl"), dagger.ContainerWithDirectoryOpts{Exclude: []string{"**/*.rlib", "**/*.a", "**/*.d"}}) |
262 | 263 | }
|
263 | 264 |
|
264 | 265 | filtered := repository.
|
@@ -314,7 +315,7 @@ func nodeBuild(ctx context.Context, client *dagger.Client, hostDirectory *dagger
|
314 | 315 | Exclude: []string{"./node_modules/"},
|
315 | 316 | }).
|
316 | 317 | WithDirectory("/src/ext", hostDirectory.Directory("tmp"), dagger.ContainerWithDirectoryOpts{
|
317 |
| - Exclude: []string{"**/*.rlib", "*_musl"}, |
| 318 | + Exclude: defaultExclude, |
318 | 319 | }).
|
319 | 320 | WithFile("/src/ext/flipt_engine.h", hostDirectory.File("flipt-engine-ffi/include/flipt_engine.h")).
|
320 | 321 | WithWorkdir("/src").
|
@@ -348,7 +349,7 @@ func rubyBuild(ctx context.Context, client *dagger.Client, hostDirectory *dagger
|
348 | 349 | WithWorkdir("/src").
|
349 | 350 | WithDirectory("/src", hostDirectory.Directory("flipt-client-ruby")).
|
350 | 351 | WithDirectory("/src/lib/ext", hostDirectory.Directory("tmp"), dagger.ContainerWithDirectoryOpts{
|
351 |
| - Exclude: []string{"**/*.rlib", "*_musl"}, |
| 352 | + Exclude: defaultExclude, |
352 | 353 | }).
|
353 | 354 | WithFile("/src/lib/ext/flipt_engine.h", hostDirectory.File("flipt-engine-ffi/include/flipt_engine.h")).
|
354 | 355 | WithExec([]string{"bundle", "install"}).
|
@@ -408,7 +409,7 @@ func javaBuild(ctx context.Context, client *dagger.Client, hostDirectory *dagger
|
408 | 409 | container := client.Container().From("gradle:8.5.0-jdk11").
|
409 | 410 | WithDirectory("/src", hostDirectory.Directory("flipt-client-java")).
|
410 | 411 | WithDirectory("/src/src/main/resources", hostDirectory.Directory("tmp"), dagger.ContainerWithDirectoryOpts{
|
411 |
| - Exclude: []string{"**/*.rlib", "*_musl"}, |
| 412 | + Exclude: defaultExclude, |
412 | 413 | }).
|
413 | 414 | WithFile("/src/main/resources/flipt_engine.h", hostDirectory.File("flipt-engine-ffi/include/flipt_engine.h")).
|
414 | 415 | WithWorkdir("/src").
|
@@ -462,7 +463,7 @@ func dartBuild(ctx context.Context, client *dagger.Client, hostDirectory *dagger
|
462 | 463 | Exclude: []string{".gitignore", ".dart_tool/"},
|
463 | 464 | }).
|
464 | 465 | WithDirectory("/src/lib/src/ffi", hostDirectory.Directory("tmp"), dagger.ContainerWithDirectoryOpts{
|
465 |
| - Exclude: []string{"**/*.rlib", "*_musl"}, |
| 466 | + Exclude: defaultExclude, |
466 | 467 | }).
|
467 | 468 | WithWorkdir("/src").
|
468 | 469 | WithExec([]string{"dart", "pub", "get"})
|
|
0 commit comments