Browse Source

Add a few minor tweaks to bashbrew for consistency

Also, run through a `--no-push` run of `push.sh` in Travis, and give Travis an explicit language so we don't get funny Ruby-related nonsense in our build logs.
Tianon Gravi 11 years ago
parent
commit
3ff8271e4e
3 changed files with 7 additions and 2 deletions
  1. 4 0
      .travis.yml
  2. 1 1
      bashbrew/build.sh
  3. 2 1
      bashbrew/push.sh

+ 4 - 0
.travis.yml

@@ -1,3 +1,6 @@
+# just pick a random language so we don't get funky "bundle" ruby stuff
+language: c
+
 # allow for use of Docker-based workers
 sudo: false
 
@@ -9,3 +12,4 @@ cache:
 # --no-build because we has no Docker in Travis :)
 script:
     - ./bashbrew/build.sh --no-build --all
+    - ./bashbrew/push.sh --no-push --all

+ 1 - 1
bashbrew/build.sh

@@ -44,7 +44,7 @@ options:
 EOUSAGE
 }
 
-opts="$(getopt -o 'h?' --long 'all,help,no-clone,no-build,library:,src:,logs:,namespaces:' -- "$@" || { usage >&2 && false; })"
+opts="$(getopt -o 'h?' --long 'help,all,no-clone,no-build,library:,src:,logs:,namespaces:' -- "$@" || { usage >&2 && false; })"
 eval set -- "$opts"
 
 doClone=1

+ 2 - 1
bashbrew/push.sh

@@ -38,7 +38,7 @@ options:
 EOUSAGE
 }
 
-opts="$(getopt -o 'h?' --long 'all,help,no-push,library:,namespaces:' -- "$@" || { usage >&2 && false; })"
+opts="$(getopt -o 'h?' --long 'help,all,no-push,library:,logs:,namespaces:' -- "$@" || { usage >&2 && false; })"
 eval set -- "$opts"
 
 doPush=1
@@ -54,6 +54,7 @@ while true; do
 		--all) buildAll=1 ;;
 		--no-push) doPush= ;;
 		--library) library="$1" && shift ;;
+		--logs) logs="$1" && shift ;;
 		--namespaces) namespaces="$1" && shift ;;
 		--)
 			break