Skip to content

N
nexpie-grafana-theme
Commit 2bdc147e by Leonard Gram
Options

build: skips building rpm for armv6.

parent 5f188058
Showing with 13 additions and 4 deletions
build.go
...@@ -46,6 +46,8 @@ var ( ...@@ -46,6 +46,8 @@ var (
binaries []string = []string{"grafana-server", "grafana-cli"} binaries []string = []string{"grafana-server", "grafana-cli"}
isDev bool = false isDev bool = false
enterprise bool = false enterprise bool = false
skipRpmGen bool = false
skipDebGen bool = false
) )
func main() { func main() {
...@@ -67,6 +69,8 @@ func main() { ...@@ -67,6 +69,8 @@ func main() {
flag.BoolVar(&enterprise, "enterprise", enterprise, "Build enterprise version of Grafana") flag.BoolVar(&enterprise, "enterprise", enterprise, "Build enterprise version of Grafana")
flag.StringVar(&buildIdRaw, "buildId", "0", "Build ID from CI system") flag.StringVar(&buildIdRaw, "buildId", "0", "Build ID from CI system")
flag.BoolVar(&isDev, "dev", isDev, "optimal for development, skips certain steps") flag.BoolVar(&isDev, "dev", isDev, "optimal for development, skips certain steps")
flag.BoolVar(&skipRpmGen, "skipRpm", skipRpmGen, "skip rpm package generation (default: false)")
flag.BoolVar(&skipDebGen, "skipDeb", skipDebGen, "skip deb package generation (default: false)")
flag.Parse() flag.Parse()
buildId = shortenBuildId(buildIdRaw) buildId = shortenBuildId(buildIdRaw)
...@@ -292,8 +296,13 @@ func createRpmPackages() { ...@@ -292,8 +296,13 @@ func createRpmPackages() {
} }
func createLinuxPackages() { func createLinuxPackages() {
createDebPackages() if !skipDebGen {
createRpmPackages() createDebPackages()
}
if !skipRpmGen {
createRpmPackages()
}
} }
func createPackage(options linuxPackageOptions) { func createPackage(options linuxPackageOptions) {
......
scripts/build/build-all.sh
...@@ -69,7 +69,7 @@ rm tools/phantomjs/phantomjs ...@@ -69,7 +69,7 @@ rm tools/phantomjs/phantomjs
# build only amd64 for enterprise # build only amd64 for enterprise
if echo "$EXTRA_OPTS" | grep -vq enterprise ; then if echo "$EXTRA_OPTS" | grep -vq enterprise ; then
go run build.go -goos linux -pkg-arch armv6 ${OPT} package-only go run build.go -goos linux -pkg-arch armv6 ${OPT} -skipRpm package-only
go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only
go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only
......
scripts/build/build.sh
...@@ -50,7 +50,7 @@ source /etc/profile.d/rvm.sh ...@@ -50,7 +50,7 @@ source /etc/profile.d/rvm.sh
echo "Packaging" echo "Packaging"
go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only
go run build.go -goos linux -pkg-arch armv6 ${OPT} package-only go run build.go -goos linux -pkg-arch armv6 ${OPT} -skipRpm package-only
go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only
go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment