cmd/dist: build hsu separately
Test / Create distribution (push) Successful in 52s
Test / Sandbox (push) Successful in 2m41s
Test / ShareFS (push) Successful in 3m47s
Test / Hakurei (push) Successful in 4m0s
Test / Sandbox (race detector) (push) Successful in 5m25s
Test / Hakurei (race detector) (push) Successful in 6m36s
Test / Flake checks (push) Successful in 1m8s
Test / Create distribution (push) Successful in 52s
Test / Sandbox (push) Successful in 2m41s
Test / ShareFS (push) Successful in 3m47s
Test / Hakurei (push) Successful in 4m0s
Test / Sandbox (race detector) (push) Successful in 5m25s
Test / Hakurei (race detector) (push) Successful in 6m36s
Test / Flake checks (push) Successful in 1m8s
This program must be built with cgo disabled, and was missed when migrating build script. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Vendored
+24
-9
@@ -35,8 +35,11 @@ func getenv(key, fallback string) string {
|
|||||||
|
|
||||||
// mustRun runs a command with the current process's environment and panics
|
// mustRun runs a command with the current process's environment and panics
|
||||||
// on error or non-zero exit code.
|
// on error or non-zero exit code.
|
||||||
func mustRun(ctx context.Context, name string, arg ...string) {
|
func mustRun(ctx context.Context, env []string, name string, arg ...string) {
|
||||||
cmd := exec.CommandContext(ctx, name, arg...)
|
cmd := exec.CommandContext(ctx, name, arg...)
|
||||||
|
if env != nil {
|
||||||
|
cmd.Env = append(cmd.Environ(), env...)
|
||||||
|
}
|
||||||
cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
|
cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
|
||||||
if err := cmd.Run(); err != nil {
|
if err := cmd.Run(); err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
@@ -49,6 +52,7 @@ var comp []byte
|
|||||||
func main() {
|
func main() {
|
||||||
log.SetFlags(0)
|
log.SetFlags(0)
|
||||||
log.SetPrefix("")
|
log.SetPrefix("")
|
||||||
|
log.SetOutput(os.Stdout)
|
||||||
|
|
||||||
verbose := os.Getenv("VERBOSE") != ""
|
verbose := os.Getenv("VERBOSE") != ""
|
||||||
runTests := os.Getenv("HAKUREI_DIST_MAKE") == ""
|
runTests := os.Getenv("HAKUREI_DIST_MAKE") == ""
|
||||||
@@ -91,26 +95,37 @@ func main() {
|
|||||||
verboseFlag = "-buildvcs=false"
|
verboseFlag = "-buildvcs=false"
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Printf("Building hakurei for %s/%s.", runtime.GOOS, runtime.GOARCH)
|
log.Printf("Building hakurei %s for %s/%s.", version, runtime.GOOS, runtime.GOARCH)
|
||||||
mustRun(ctx, "go", "generate", "./...")
|
mustRun(ctx, nil, "go", "generate", "./...")
|
||||||
mustRun(
|
mustRun(
|
||||||
ctx, "go", "build",
|
ctx, nil, "go", "build",
|
||||||
"-trimpath",
|
"-trimpath",
|
||||||
verboseFlag, "-o", s,
|
verboseFlag, "-o", s,
|
||||||
"-ldflags=-s -w "+
|
"-ldflags=-s -w "+
|
||||||
"-buildid= -linkmode external -extldflags=-static "+
|
"-buildid= -linkmode external -extldflags=-static "+
|
||||||
"-X hakurei.app/internal/info.buildVersion="+version+" "+
|
"-X hakurei.app/internal/info.buildVersion="+version+" "+
|
||||||
"-X hakurei.app/internal/info.hakureiPath="+prefix+"/bin/hakurei "+
|
"-X hakurei.app/internal/info.hakureiPath="+prefix+"/bin/hakurei "+
|
||||||
"-X hakurei.app/internal/info.hsuPath="+prefix+"/bin/hsu "+
|
"-X hakurei.app/internal/info.hsuPath="+prefix+"/bin/hsu",
|
||||||
"-X main.hakureiPath="+prefix+"/bin/hakurei",
|
"./cmd/hakurei",
|
||||||
"./...",
|
"./cmd/sharefs",
|
||||||
)
|
)
|
||||||
log.Println()
|
|
||||||
|
|
||||||
|
log.Printf("Building cmd/hsu for %s/%s.", runtime.GOOS, runtime.GOARCH)
|
||||||
|
mustRun(
|
||||||
|
ctx, []string{"CGO_ENABLED=0"}, "go", "build",
|
||||||
|
"-trimpath",
|
||||||
|
verboseFlag, "-o", s,
|
||||||
|
"-ldflags=-s -w "+
|
||||||
|
"-buildid= "+
|
||||||
|
"-X main.hakureiPath="+prefix+"/bin/hakurei",
|
||||||
|
"./cmd/hsu",
|
||||||
|
)
|
||||||
|
|
||||||
|
log.Println()
|
||||||
if runTests {
|
if runTests {
|
||||||
log.Println("##### Testing Hakurei.")
|
log.Println("##### Testing Hakurei.")
|
||||||
mustRun(
|
mustRun(
|
||||||
ctx, "go", "test",
|
ctx, nil, "go", "test",
|
||||||
"-ldflags=-buildid= -linkmode external -extldflags=-static",
|
"-ldflags=-buildid= -linkmode external -extldflags=-static",
|
||||||
"./...",
|
"./...",
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -48,8 +48,13 @@ go build -trimpath -tags=rosa -o /work/system/libexec/hakurei -ldflags="-s -w
|
|||||||
-X hakurei.app/internal/info.buildVersion=$(cat cmd/dist/VERSION)
|
-X hakurei.app/internal/info.buildVersion=$(cat cmd/dist/VERSION)
|
||||||
-X hakurei.app/internal/info.hakureiPath=/system/bin/hakurei
|
-X hakurei.app/internal/info.hakureiPath=/system/bin/hakurei
|
||||||
-X hakurei.app/internal/info.hsuPath=/system/bin/hsu
|
-X hakurei.app/internal/info.hsuPath=/system/bin/hsu
|
||||||
|
" ./cmd/hakurei ./cmd/sharefs
|
||||||
|
|
||||||
|
echo "Building hsu for $(go env GOOS)/$(go env GOARCH)."
|
||||||
|
CGO_ENABLED=0 go build -trimpath -tags=rosa -o /work/system/libexec/hakurei -ldflags="-s -w
|
||||||
|
-buildid=
|
||||||
-X main.hakureiPath=/system/bin/hakurei
|
-X main.hakureiPath=/system/bin/hakurei
|
||||||
" ./...
|
" ./cmd/hsu
|
||||||
echo`;
|
echo`;
|
||||||
check = `
|
check = `
|
||||||
echo '##### Testing hakurei.'
|
echo '##### Testing hakurei.'
|
||||||
|
|||||||
Reference in New Issue
Block a user