You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/09/08 22:49:17 UTC

[1/4] isis git commit: ISIS-1465: for .travis.yml, use 'script' rather than 'install' to build the project (otherwise will run 'mvn test -B' at the end as the default script)

Repository: isis
Updated Branches:
  refs/heads/maint-1.13.1 e788773fe -> 8e6baa275


ISIS-1465: for .travis.yml, use 'script' rather than 'install' to build the project (otherwise will run 'mvn test -B' at the end as the default script)


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8829ff82
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8829ff82
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8829ff82

Branch: refs/heads/maint-1.13.1
Commit: 8829ff82533bfff98284f4bbb316d4b15e275b4d
Parents: e788773
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 8 23:28:30 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 8 23:28:30 2016 +0200

----------------------------------------------------------------------
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/8829ff82/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c44eb99..2bb59e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
 language: java
 jdk:
   - oraclejdk8
-install: "mvn clean install -Dskip.app -Dskip.arch"
+script: "mvn clean install -Dskip.app -Dskip.arch"


[2/4] isis git commit: ISIS-1465: another attempt at getting travis to build (no 'install' step)

Posted by da...@apache.org.
ISIS-1465: another attempt at getting travis to build (no 'install' step)


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4c0f2e4e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4c0f2e4e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4c0f2e4e

Branch: refs/heads/maint-1.13.1
Commit: 4c0f2e4e5b7854d4d0f874fba33838a5da4213ab
Parents: 8829ff8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 8 23:38:14 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 8 23:38:14 2016 +0200

----------------------------------------------------------------------
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/4c0f2e4e/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 2bb59e0..a3950e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: java
 jdk:
   - oraclejdk8
+install: 
 script: "mvn clean install -Dskip.app -Dskip.arch"


[4/4] isis git commit: ISIS-1465: enhancing interim-release.sh to automatically cleanrremote branches and push new branch (and tag)

Posted by da...@apache.org.
ISIS-1465: enhancing interim-release.sh to automatically cleanrremote branches and push new branch (and tag)


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8e6baa27
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8e6baa27
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8e6baa27

Branch: refs/heads/maint-1.13.1
Commit: 8e6baa275e21ab2e5f4ff9ac66d34cf2469c843c
Parents: b2f0226
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 9 00:15:31 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 9 00:32:20 2016 +0200

----------------------------------------------------------------------
 interim-release.sh | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/8e6baa27/interim-release.sh
----------------------------------------------------------------------
diff --git a/interim-release.sh b/interim-release.sh
index ea2231b..34dacb8 100644
--- a/interim-release.sh
+++ b/interim-release.sh
@@ -1,8 +1,10 @@
+#!/bin/bash
 VERSION_BASE=$1
+REMOTE=$2
 
-if [ ! "$VERSION_BASE" ]; then
-    echo "usage: $(basename $0) [base version]"
-    echo "   eg: $(basename $0) 1.13.0"
+if [ -z "$VERSION_BASE" -o -z "$REMOTE" ]; then
+    echo "usage: $(basename $0) [base version] [remote]"
+    echo "   eg: $(basename $0) 1.13.0 incodehq"
     exit 1
 fi
 
@@ -12,6 +14,13 @@ VERSION="$VERSION_BASE.$DATE"
 BRANCH="interim/$VERSION"
 TAG="isis-$VERSION"
 
+echo "removing any earlier (local) 'interim' branches"
+for a in `git branch --list | grep interim`
+do
+    git branch -D $a
+done
+
+echo "checking out new branch $BRANCH"
 git checkout -b "$BRANCH"
 
 echo "updating version in all pom.xml files..."
@@ -24,3 +33,16 @@ git commit -am "bumping to $VERSION"
 
 echo "tagging"
 git tag $TAG
+
+echo "removing any earlier remote branches"
+for a in `git ls-remote --heads $REMOTE  | sed 's?.*refs/heads/??' | grep interim`
+do
+    git push $REMOTE --delete $a
+done
+
+echo "pushing tag"
+git push $REMOTE $TAG
+
+echo "pushing branch"
+git push $REMOTE $BRANCH
+


[3/4] isis git commit: ISIS-1465: yet another attempt to fix .travis.yml

Posted by da...@apache.org.
ISIS-1465: yet another attempt to fix .travis.yml


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b2f0226b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b2f0226b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b2f0226b

Branch: refs/heads/maint-1.13.1
Commit: b2f0226b551a7ccba4435ce03985e2d35af2f946
Parents: 4c0f2e4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 8 23:45:48 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 8 23:45:48 2016 +0200

----------------------------------------------------------------------
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/b2f0226b/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index a3950e8..ae5c5a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,4 +2,5 @@ language: java
 jdk:
   - oraclejdk8
 install: 
+  - 
 script: "mvn clean install -Dskip.app -Dskip.arch"