You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/28 17:15:34 UTC
[1/4] incubator-trafficcontrol git commit: revcount and commit from
buildno
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/1.8.x 9cbd3d373 -> bb04cdc38
revcount and commit from buildno
(cherry picked from commit c2564669f3e206d88959fabb7338352b67e25aa7)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/735d34d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/735d34d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/735d34d8
Branch: refs/heads/1.8.x
Commit: 735d34d8fe8bdf5dfa57244d01fbd93f3d88c500
Parents: 9cbd3d3
Author: Dan Kirkwood <da...@gmail.com>
Authored: Sat Nov 12 19:00:25 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 28 10:12:16 2016 -0700
----------------------------------------------------------------------
build/functions.sh | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/735d34d8/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index bb63530..c9dba30 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%.*}
}
# ---------------------------------------
@@ -54,9 +55,9 @@ function isInGitTree() {
# ---------------------------------------
function getBuildNumber() {
- local in_git=$(isInGitTree)
- if [[ $in_git ]]; then
- local commits=$(getRevCount)
+ local in_git=$()
+ if isInGitTree; then
+ local commits=$(git rev-list HEAD 2>/dev/null | wc -l)
local sha=$(git rev-parse --short=8 HEAD)
echo "$commits.$sha"
else
@@ -80,7 +81,8 @@ function getRhelVersion {
# ---------------------------------------
function getCommit() {
- git rev-parse HEAD
+ local buildNum=$(getBuildNumber)
+ echo ${buildNum%.*}
}
# ---------------------------------------
[2/4] incubator-trafficcontrol git commit: if not in git tree,
no tarball
Posted by da...@apache.org.
if not in git tree, no tarball
(cherry picked from commit 5911d404d46a78926626d0f781caff926f7b6ce9)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2c60b19a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2c60b19a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2c60b19a
Branch: refs/heads/1.8.x
Commit: 2c60b19a8bf08c0f4cb71b70a3060b4162325c93
Parents: 735d34d
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Nov 11 18:41:11 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 28 10:12:18 2016 -0700
----------------------------------------------------------------------
build/functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2c60b19a/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index c9dba30..ef0c222 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -57,7 +57,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
[3/4] incubator-trafficcontrol git commit: use $BUILD_NUMBER from env
for traffic_router version
Posted by da...@apache.org.
use $BUILD_NUMBER from env for traffic_router version
(cherry picked from commit cb93b43e1c347c3838f493d387086af1a2519e81)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/bb04cdc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/bb04cdc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/bb04cdc3
Branch: refs/heads/1.8.x
Commit: bb04cdc3810f6a3f2374a750eee983b6fa79dc64
Parents: 18160b9
Author: Dan Kirkwood <da...@gmail.com>
Authored: Mon Nov 21 19:55:40 2016 +0000
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 28 10:12:18 2016 -0700
----------------------------------------------------------------------
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/bb04cdc3/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/bb04cdc3/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/4] incubator-trafficcontrol git commit: revcount and commit from
buildno
Posted by da...@apache.org.
revcount and commit from buildno
(cherry picked from commit 646b7e9bcd017c940471fb198b32451872d4edc2)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/18160b9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/18160b9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/18160b9b
Branch: refs/heads/1.8.x
Commit: 18160b9b7a2e226ece831dab5ba278d039c3e440
Parents: 2c60b19
Author: Dan Kirkwood <da...@gmail.com>
Authored: Sat Nov 12 19:00:25 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 28 10:12:18 2016 -0700
----------------------------------------------------------------------
build/functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/18160b9b/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index ef0c222..c9dba30 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -57,7 +57,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