diff options
| -rwxr-xr-x | all.sh | 9 | ||||
| -rwxr-xr-x | cmd/dist/dist.sh | 10 | ||||
| -rw-r--r-- | cmd/dist/main.go | 17 | ||||
| -rwxr-xr-x | make.sh | 3 |
4 files changed, 24 insertions, 15 deletions
@@ -1,10 +1,3 @@ #!/bin/sh -e -TOOLCHAIN_VERSION="$(go version)" -cd "$(dirname -- "$0")/" -echo "Building cmd/dist using ${TOOLCHAIN_VERSION}." -FLAGS='' -if test -n "$VERBOSE"; then - FLAGS="$FLAGS -v" -fi -go run $FLAGS --tags=dist ./cmd/dist +HAKUREI_DIST_MAKE='' exec "$(dirname -- "$0")/cmd/dist/dist.sh" diff --git a/cmd/dist/dist.sh b/cmd/dist/dist.sh new file mode 100755 index 00000000..42240be2 --- /dev/null +++ b/cmd/dist/dist.sh @@ -0,0 +1,10 @@ +#!/bin/sh -e + +TOOLCHAIN_VERSION="$(go version)" +cd "$(dirname -- "$0")/../.." +echo "Building cmd/dist using ${TOOLCHAIN_VERSION}." +FLAGS='' +if test -n "$VERBOSE"; then + FLAGS="$FLAGS -v" +fi +go run $FLAGS --tags=dist ./cmd/dist diff --git a/cmd/dist/main.go b/cmd/dist/main.go index c71dd806..9ed7f2f8 100644 --- a/cmd/dist/main.go +++ b/cmd/dist/main.go @@ -46,6 +46,7 @@ func main() { log.SetPrefix("") verbose := os.Getenv("VERBOSE") != "" + runTests := os.Getenv("HAKUREI_DIST_MAKE") == "" version := getenv("HAKUREI_VERSION", "untagged") prefix := getenv("PREFIX", "/usr") destdir := getenv("DESTDIR", "dist") @@ -101,13 +102,15 @@ func main() { ) log.Println() - log.Println("##### Testing Hakurei.") - mustRun( - ctx, "go", "test", - "-ldflags=-buildid= -linkmode external -extldflags=-static", - "./...", - ) - log.Println() + if runTests { + log.Println("##### Testing Hakurei.") + mustRun( + ctx, "go", "test", + "-ldflags=-buildid= -linkmode external -extldflags=-static", + "./...", + ) + log.Println() + } log.Println("##### Creating distribution.") const suffix = ".tar.gz" diff --git a/make.sh b/make.sh new file mode 100755 index 00000000..e1eef6b7 --- /dev/null +++ b/make.sh @@ -0,0 +1,3 @@ +#!/bin/sh -e + +HAKUREI_DIST_MAKE=1 exec "$(dirname -- "$0")/cmd/dist/dist.sh" |