From 22638db5325cb9b2d8602d95cffb84a4f49c47bc Mon Sep 17 00:00:00 2001 From: fg2it Date: Wed, 23 May 2018 23:53:59 +0200 Subject: [PATCH] fix names of foreign arch packages --- build.go | 13 +++++- scripts/build/build-all.sh | 86 +++++++++++++++----------------------- 2 files changed, 46 insertions(+), 53 deletions(-) diff --git a/build.go b/build.go index f9611c99a47..35531faf2dd 100644 --- a/build.go +++ b/build.go @@ -144,7 +144,7 @@ func packageGrafana() { grunt(postProcessArgs...) pkgArch = previousPkgArch - if goos == "linux" && goarch == "amd64"{ + if goos == "linux" { createLinuxPackages() } } @@ -229,6 +229,10 @@ type linuxPackageOptions struct { } func createDebPackages() { + previousPkgArch := pkgArch + if pkgArch == "armv7" { + pkgArch = "armhf" + } createPackage(linuxPackageOptions{ packageType: "deb", homeDir: "/usr/share/grafana", @@ -246,9 +250,15 @@ func createDebPackages() { depends: []string{"adduser", "libfontconfig"}, }) + pkgArch = previousPkgArch } func createRpmPackages() { + previousPkgArch := pkgArch + switch { + case pkgArch == "armv7" : pkgArch = "armhfp" + case pkgArch == "arm64" : pkgArch = "aarch64" + } createPackage(linuxPackageOptions{ packageType: "rpm", homeDir: "/usr/share/grafana", @@ -266,6 +276,7 @@ func createRpmPackages() { depends: []string{"/sbin/service", "fontconfig", "freetype", "urw-fonts"}, }) + pkgArch = previousPkgArch } func createLinuxPackages() { diff --git a/scripts/build/build-all.sh b/scripts/build/build-all.sh index 7c08d2c333c..6029b14605a 100755 --- a/scripts/build/build-all.sh +++ b/scripts/build/build-all.sh @@ -18,20 +18,18 @@ echo "current dir: $(pwd)" if [ "$CIRCLE_TAG" != "" ]; then echo "Building releases from tag $CIRCLE_TAG" - go run build.go -goarch armv7 -cc ${CCARMV7} -includeBuildNumber=false build - go run build.go -goarch arm64 -cc ${CCARM64} -includeBuildNumber=false build - go run build.go -goos darwin -cc ${CCOSX64} -includeBuildNumber=false build - go run build.go -goos windows -cc ${CCWIN64} -includeBuildNumber=false build - CC=${CCX64} go run build.go -includeBuildNumber=false build + OPT="-includeBuildNumber=false" else echo "Building incremental build for $CIRCLE_BRANCH" - go run build.go -goarch armv7 -cc ${CCARMV7} -buildNumber=${CIRCLE_BUILD_NUM} build - go run build.go -goarch arm64 -cc ${CCARM64} -buildNumber=${CIRCLE_BUILD_NUM} build - go run build.go -goos darwin -cc ${CCOSX64} -buildNumber=${CIRCLE_BUILD_NUM} build - go run build.go -goos windows -cc ${CCWIN64} -buildNumber=${CIRCLE_BUILD_NUM} build - CC=${CCX64} go run build.go -buildNumber=${CIRCLE_BUILD_NUM} build + OPT="-buildNumber=${CIRCLE_BUILD_NUM}" fi +go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build +go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build +go run build.go -goos darwin -cc ${CCOSX64} ${OPT} build +go run build.go -goos windows -cc ${CCWIN64} ${OPT} build +CC=${CCX64} go run build.go ${OPT} build + yarn install --pure-lockfile --no-progress echo "current dir: $(pwd)" @@ -41,47 +39,31 @@ if [ -d "dist" ]; then fi if [ "$CIRCLE_TAG" != "" ]; then - echo "Building frontend from tag $CIRCLE_TAG" - go run build.go -includeBuildNumber=false build-frontend - echo "Packaging a release from tag $CIRCLE_TAG" - go run build.go -goos linux -pkg-arch amd64 -includeBuildNumber=false package-only latest - go run build.go -goos linux -pkg-arch armv7 -includeBuildNumber=false package-only - go run build.go -goos linux -pkg-arch arm64 -includeBuildNumber=false package-only - - if [ -d '/tmp/phantomjs/darwin' ]; then - cp /tmp/phantomjs/darwin/phantomjs tools/phantomjs/phantomjs - else - echo 'PhantomJS binaries for darwin missing!' - fi - go run build.go -goos darwin -pkg-arch amd64 -includeBuildNumber=false package-only - - if [ -d '/tmp/phantomjs/windows' ]; then - cp /tmp/phantomjs/windows/phantomjs.exe tools/phantomjs/phantomjs.exe - rm tools/phantomjs/phantomjs - else - echo 'PhantomJS binaries for darwin missing!' - fi - go run build.go -goos windows -pkg-arch amd64 -includeBuildNumber=false package-only + echo "Building frontend and packaging from tag $CIRCLE_TAG" else - echo "Building frontend for $CIRCLE_BRANCH" - go run build.go -buildNumber=${CIRCLE_BUILD_NUM} build-frontend - echo "Packaging incremental build for $CIRCLE_BRANCH" - go run build.go -goos linux -pkg-arch amd64 -buildNumber=${CIRCLE_BUILD_NUM} package-only latest - go run build.go -goos linux -pkg-arch armv7 -buildNumber=${CIRCLE_BUILD_NUM} package-only - go run build.go -goos linux -pkg-arch arm64 -buildNumber=${CIRCLE_BUILD_NUM} package-only - - if [ -d '/tmp/phantomjs/darwin' ]; then - cp /tmp/phantomjs/darwin/phantomjs tools/phantomjs/phantomjs - else - echo 'PhantomJS binaries for darwin missing!' - fi - go run build.go -goos darwin -pkg-arch amd64 -buildNumber=${CIRCLE_BUILD_NUM} package-only - - if [ -d '/tmp/phantomjs/windows' ]; then - cp /tmp/phantomjs/windows/phantomjs.exe tools/phantomjs/phantomjs.exe - rm tools/phantomjs/phantomjs - else - echo 'PhantomJS binaries for windows missing!' - fi - go run build.go -goos windows -pkg-arch amd64 -buildNumber=${CIRCLE_BUILD_NUM} package-only + echo "Building frontend and packaging incremental build for $CIRCLE_BRANCH" fi +echo "Building frontend" +go run build.go ${OPT} build-frontend +echo "Packaging" +go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only latest +#removing amd64 phantomjs bin for armv7/arm64 packages +rm tools/phantomjs/phantomjs +go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only +go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only + +if [ -d '/tmp/phantomjs/darwin' ]; then + cp /tmp/phantomjs/darwin/phantomjs tools/phantomjs/phantomjs +else + echo 'PhantomJS binaries for darwin missing!' +fi +go run build.go -goos darwin -pkg-arch amd64 ${OPT} package-only + +if [ -d '/tmp/phantomjs/windows' ]; then + cp /tmp/phantomjs/windows/phantomjs.exe tools/phantomjs/phantomjs.exe + rm tools/phantomjs/phantomjs +else + echo 'PhantomJS binaries for darwin missing!' +fi +go run build.go -goos windows -pkg-arch amd64 ${OPT} package-only +