Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Buildpack packaging should always target linux #307

Merged
merged 1 commit into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packagers/jam.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func (j Jam) Execute(buildpackDir, output, version string, offline bool) error {
output,
"--path", buildpackTarballPath,
"--format", "file",
"--target", fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
"--target", fmt.Sprintf("linux/%s", runtime.GOARCH),
}

return j.pack.Execute(pexec.Execution{
Expand Down
6 changes: 3 additions & 3 deletions packagers/jam_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func testJam(t *testing.T, context spec.G, it spec.S) {
"some-output",
"--path", filepath.Join("some-jam-output", "some-version.tgz"),
"--format", "file",
"--target", fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
"--target", fmt.Sprintf("linux/%s", runtime.GOARCH),
}))
})

Expand All @@ -77,7 +77,7 @@ func testJam(t *testing.T, context spec.G, it spec.S) {
"some-output",
"--path", filepath.Join("some-jam-output", "some-version.tgz"),
"--format", "file",
"--target", fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
"--target", fmt.Sprintf("linux/%s", runtime.GOARCH),
}))
})
})
Expand Down Expand Up @@ -115,7 +115,7 @@ func testJam(t *testing.T, context spec.G, it spec.S) {
"some-output",
"--path", filepath.Join("some-jam-output", "some-version.tgz"),
"--format", "file",
"--target", fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
"--target", fmt.Sprintf("linux/%s", runtime.GOARCH),
}))
})
})
Expand Down
2 changes: 1 addition & 1 deletion packagers/libpak.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func (l Libpak) Execute(buildpackDir, output, version string, cached bool) error
output,
"--path", libpakOutput,
"--format", "file",
"--target", fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
"--target", fmt.Sprintf("linux/%s", runtime.GOARCH),
}

return l.pack.Execute(pexec.Execution{
Expand Down
4 changes: 2 additions & 2 deletions packagers/libpak_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func testLibpak(t *testing.T, context spec.G, it spec.S) {
"some-output-dir",
"--path", "some-libpak-output-dir",
"--format", "file",
"--target", fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
"--target", fmt.Sprintf("linux/%s", runtime.GOARCH),
}))
})

Expand All @@ -72,7 +72,7 @@ func testLibpak(t *testing.T, context spec.G, it spec.S) {
"some-output-dir",
"--path", "some-libpak-output-dir",
"--format", "file",
"--target", fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
"--target", fmt.Sprintf("linux/%s", runtime.GOARCH),
}))
})
})
Expand Down
Loading