You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by jv...@apache.org on 2016/11/28 16:45:24 UTC
[1/6] incubator-trafficcontrol git commit: revcount and commit from
buildno
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master ca648d90c -> 8e86acff9
revcount and commit from buildno
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/646b7e9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/646b7e9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/646b7e9b
Branch: refs/heads/master
Commit: 646b7e9bcd017c940471fb198b32451872d4edc2
Parents: 5911d40
Author: Dan Kirkwood <da...@gmail.com>
Authored: Sat Nov 12 19:00:25 2016 -0700
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Nov 28 16:42:44 2016 +0000
----------------------------------------------------------------------
build/functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/646b7e9b/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index c237288..6fa861f 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -58,7 +58,7 @@ function isInGitTree() {
function getBuildNumber() {
local in_git=$()
if isInGitTree; then
- local commits=$(getRevCount)
+ local commits=$(git rev-list HEAD 2>/dev/null | wc -l)
local sha=$(git rev-parse --short=8 HEAD)
echo "$commits.$sha"
else
[6/6] incubator-trafficcontrol git commit: This closes #75
Posted by jv...@apache.org.
This closes #75
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8e86acff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8e86acff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8e86acff
Branch: refs/heads/master
Commit: 8e86acff95b9001aa931f8fde43c96557613c0c4
Parents: cb93b43
Author: Jan van Doorn <jv...@apache.org>
Authored: Mon Nov 28 16:44:41 2016 +0000
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Nov 28 16:44:41 2016 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/6] incubator-trafficcontrol git commit: use $BUILD_NUMBER from env
for traffic_router version
Posted by jv...@apache.org.
use $BUILD_NUMBER from env for traffic_router version
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/cb93b43e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/cb93b43e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/cb93b43e
Branch: refs/heads/master
Commit: cb93b43e1c347c3838f493d387086af1a2519e81
Parents: 646b7e9
Author: Dan Kirkwood <da...@gmail.com>
Authored: Mon Nov 21 19:55:40 2016 +0000
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Nov 28 16:42:45 2016 +0000
----------------------------------------------------------------------
traffic_router/build/build_rpm.sh | 2 +-
traffic_router/build/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/cb93b43e/traffic_router/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_router/build/build_rpm.sh b/traffic_router/build/build_rpm.sh
index a7fc5ff..43d6943 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -56,7 +56,7 @@ function buildRpmTrafficRouter () {
installDnsSec
cd "$TR_DIR" || { echo "Could not cd to $TR_DIR: $?"; exit 1; }
- export GIT_REV_COUNT=$(getRevCount)
+ export BUILD_NUMBER=${BUILD_NUMBER:-$(getBuildNumber)}
mvn -P rpm-build -Dmaven.test.skip=true -DminimumTPS=1 clean package || \
{ echo "RPM BUILD FAILED: $?"; exit 1; }
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/cb93b43e/traffic_router/build/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index fc30608..a4e611b 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -87,7 +87,7 @@
<configuration>
<rules>
<requireEnvironmentVariable>
- <variableName>GIT_REV_COUNT</variableName>
+ <variableName>BUILD_NUMBER</variableName>
</requireEnvironmentVariable>
</rules>
<fail>true</fail>
@@ -125,7 +125,7 @@
<configuration>
<group>Applications/Internet</group>
<name>${project.parent.artifactId}</name>
- <release>${env.GIT_REV_COUNT}.${buildNumber}.el6</release>
+ <release>${env.BUILD_NUMBER}.el6</release>
<needarch>x86_64</needarch>
<mappings>
<mapping>
[4/6] incubator-trafficcontrol git commit: revcount and commit from
buildno
Posted by jv...@apache.org.
revcount and commit from buildno
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c2564669
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c2564669
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c2564669
Branch: refs/heads/master
Commit: c2564669f3e206d88959fabb7338352b67e25aa7
Parents: df48015
Author: Dan Kirkwood <da...@gmail.com>
Authored: Sat Nov 12 19:00:25 2016 -0700
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Nov 28 16:42:44 2016 +0000
----------------------------------------------------------------------
build/functions.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c2564669/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 4f56e7a..6fa861f 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -44,7 +44,8 @@ function versionOk() {
# ---------------------------------------
function getRevCount() {
- git rev-list HEAD 2>/dev/null | wc -l
+ local buildNum=$(getBuildNumber)
+ echo ${buildNum%.*}
}
# ---------------------------------------
@@ -57,7 +58,7 @@ function isInGitTree() {
function getBuildNumber() {
local in_git=$()
if isInGitTree; then
- local commits=$(getRevCount)
+ local commits=$(git rev-list HEAD 2>/dev/null | wc -l)
local sha=$(git rev-parse --short=8 HEAD)
echo "$commits.$sha"
else
@@ -85,7 +86,8 @@ function getRhelVersion {
# ---------------------------------------
function getCommit() {
- git rev-parse HEAD
+ local buildNum=$(getBuildNumber)
+ echo ${buildNum%.*}
}
# ---------------------------------------
[3/6] incubator-trafficcontrol git commit: if not in git tree,
no tarball
Posted by jv...@apache.org.
if not in git tree, no tarball
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5911d404
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5911d404
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5911d404
Branch: refs/heads/master
Commit: 5911d404d46a78926626d0f781caff926f7b6ce9
Parents: c256466
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Nov 11 18:41:11 2016 -0700
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Nov 28 16:42:44 2016 +0000
----------------------------------------------------------------------
build/functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5911d404/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 6fa861f..c237288 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -58,7 +58,7 @@ function isInGitTree() {
function getBuildNumber() {
local in_git=$()
if isInGitTree; then
- local commits=$(git rev-list HEAD 2>/dev/null | wc -l)
+ local commits=$(getRevCount)
local sha=$(git rev-parse --short=8 HEAD)
echo "$commits.$sha"
else
[2/6] incubator-trafficcontrol git commit: if not in git tree,
no tarball
Posted by jv...@apache.org.
if not in git tree, no tarball
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/df480152
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/df480152
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/df480152
Branch: refs/heads/master
Commit: df480152e958ff3e137974c5064743d1edeadfab
Parents: ca648d9
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Nov 11 18:41:11 2016 -0700
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Nov 28 16:42:44 2016 +0000
----------------------------------------------------------------------
build/build.sh | 12 +++++++-----
build/functions.sh | 7 ++++---
2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/df480152/build/build.sh
----------------------------------------------------------------------
diff --git a/build/build.sh b/build/build.sh
index 1327280..32d47d4 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -28,11 +28,13 @@ export TC_DIR=$(dirname $(dirname "$topscript"))
checkEnvironment
# Create tarball first
-projName=$(basename $(pwd))
-echo "----- Building tarball ..."
-tarball=$(createTarball "$TC_DIR")
-ls -l $tarball
-
+if isInGitTree; then
+ echo "----- Building tarball ..."
+ tarball=$(createTarball "$TC_DIR")
+ ls -l $tarball
+else
+ echo "---- Skipping tarball creation"
+fi
if [[ $# -gt 0 ]]; then
projects=( "$*" )
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/df480152/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 2132064..4f56e7a 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -49,13 +49,14 @@ function getRevCount() {
# ---------------------------------------
function isInGitTree() {
- git rev-parse --is-inside-work-tree 2>/dev/null
+ # ignore output -- use exit status
+ git rev-parse --is-inside-work-tree >/dev/null 2>&1
}
# ---------------------------------------
function getBuildNumber() {
- local in_git=$(isInGitTree)
- if [[ $in_git ]]; then
+ local in_git=$()
+ if isInGitTree; then
local commits=$(getRevCount)
local sha=$(git rev-parse --short=8 HEAD)
echo "$commits.$sha"