IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

tech(build): use build number as iteration number

Browse Source
This commit is contained in:
bergquist
2017-02-02 15:55:37 +01:00
parent a580113de4
commit 3e62b1b2d7
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.go
View File

@@ -38,6 +38,7 @@ var (
phjsToRelease string phjsToRelease string
workingDir string workingDir string
includeBuildNumber bool = true includeBuildNumber bool = true
buildNumber int = 0
binaries []string = []string{"grafana-server", "grafana-cli"} binaries []string = []string{"grafana-server", "grafana-cli"}
) )
@@ -58,6 +59,7 @@ func main() {
flag.StringVar(&phjsToRelease, "phjs", "", "PhantomJS binary") flag.StringVar(&phjsToRelease, "phjs", "", "PhantomJS binary")
flag.BoolVar(&race, "race", race, "Use race detector") flag.BoolVar(&race, "race", race, "Use race detector")
flag.BoolVar(&includeBuildNumber, "includeBuildNumber", includeBuildNumber, "IncludeBuildNumber in package name") flag.BoolVar(&includeBuildNumber, "includeBuildNumber", includeBuildNumber, "IncludeBuildNumber in package name")
flag.IntVar(&buildNumber, "buildNumber", 0, "Build number from CI system")
flag.Parse() flag.Parse()
readVersionFromPackageJson() readVersionFromPackageJson()
@@ -157,7 +159,11 @@ func readVersionFromPackageJson() {
// add timestamp to iteration // add timestamp to iteration
if includeBuildNumber { if includeBuildNumber {
linuxPackageIteration = fmt.Sprintf("%d%s", time.Now().Unix(), linuxPackageIteration) if buildNumber != 0 {
linuxPackageIteration = fmt.Sprintf("%d%s", buildNumber, linuxPackageIteration)
} else {
linuxPackageIteration = fmt.Sprintf("%d%s", time.Now().Unix(), linuxPackageIteration)
}
} }
} }

8
scripts/build/build.sh
View File

@@ -25,10 +25,10 @@ echo "current dir: $(pwd)"
if [ "$CIRCLE_TAG" != "" ]; then if [ "$CIRCLE_TAG" != "" ]; then
echo "Building a release from tag $CIRCLE_TAG" echo "Building a release from tag $CIRCLE_TAG"
go run build.go -includeBuildNumber=false build go run build.go -buildNumber=${CIRCLE_BUILD_NUM} -includeBuildNumber=false build
else else
echo "Building incremental build for $CIRCLE_BRANCH" echo "Building incremental build for $CIRCLE_BRANCH"
go run build.go build go run build.go -buildNumber=${CIRCLE_BUILD_NUM} build
fi fi
yarn install --pure-lockfile yarn install --pure-lockfile
@@ -42,10 +42,10 @@ echo "current dir: $(pwd)"
if [ "$CIRCLE_TAG" != "" ]; then if [ "$CIRCLE_TAG" != "" ]; then
echo "Packaging a release from tag $CIRCLE_TAG" echo "Packaging a release from tag $CIRCLE_TAG"
go run build.go -includeBuildNumber=false package latest go run build.go -buildNumber=${CIRCLE_BUILD_NUM} -includeBuildNumber=false package latest
else else
echo "Packaging incremental build for $CIRCLE_BRANCH" echo "Packaging incremental build for $CIRCLE_BRANCH"
go run build.go package latest go run build.go -buildNumber=${CIRCLE_BUILD_NUM} package latest
fi fi
cp dist/* /tmp/dist/ cp dist/* /tmp/dist/

1
scripts/build/deploy.sh
View File

@@ -8,4 +8,5 @@ docker run -i -t --name gfbuild \
-v $(pwd)/dist:/tmp/dist \ -v $(pwd)/dist:/tmp/dist \
-e "CIRCLE_BRANCH=${CIRCLE_BRANCH}" \ -e "CIRCLE_BRANCH=${CIRCLE_BRANCH}" \
-e "CIRCLE_TAG=${CIRCLE_TAG}" \ -e "CIRCLE_TAG=${CIRCLE_TAG}" \
-e "CIRCLE_BUILD_NUM=${CIRCLE_BUILD_NUM}"
grafana/buildcontainer grafana/buildcontainer