Skip to content

Commit

Permalink
Merge pull request #176 from ambiata/topic/bar
Browse files Browse the repository at this point in the history
Build updates
  • Loading branch information
olorin authored Feb 24, 2017
2 parents 75d5dbd + f0d6985 commit 7a5e8dc
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
18 changes: 6 additions & 12 deletions boris-git.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
[boris]
version = 1

[build.profiling]
git = "refs/heads/profiling/*"

[build.dist-7-8]
git = "refs/heads/master"

[build.dist-7-10]
[build.dist-*]
git = "refs/heads/master"

[build.branches-7-8]
[build.branches-*]
git = "refs/heads/topic/*"

[build.branches-7-10]
git = "refs/heads/topic/*"
[build.profiling-*]
git = "refs/heads/profiling/*"

[build.validate]
git = "refs/heads/master"
[build.all-*]
git = "refs/heads/**"
12 changes: 8 additions & 4 deletions boris.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
[boris]
version = 1

[build.profiling]
[build.profiling-7-10]

[build.dist-7-10]
command = [["master", "build", "dist-7-10"], ["./bin/ci.doc"]]

[build.branches-7-10]
command = [["master", "build", "branches-7-10"], ["./bin/ci.doc.branches"]]

[build.validate]
pre = []
[build.dist-validate]
command = [["validate-respect"]]
success = []

[build.all-submodules]
command = [["dangling-refs"]]

[build.all-rebased]
command = [["rebased"]]
6 changes: 4 additions & 2 deletions mafia
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/sh -eu

: ${MAFIA_HOME:=$HOME/.mafia}

fetch_latest () {
if [ -z ${MAFIA_TEST_MODE+x} ]; then
TZ=$(date +"%T")
Expand Down Expand Up @@ -55,7 +57,7 @@ exec_mafia () {
# If we can't find the mafia version, then we need to upgrade the script.
run_upgrade
else
MAFIA_BIN=$HOME/.ambiata/mafia/bin
MAFIA_BIN=$MAFIA_HOME/bin
MAFIA_FILE=mafia-$MAFIA_VERSION
MAFIA_PATH=$MAFIA_BIN/$MAFIA_FILE

Expand Down Expand Up @@ -118,4 +120,4 @@ case "$MODE" in
upgrade) shift; run_upgrade "$@" ;;
*) exec_mafia "$@"
esac
# Version: de245376fd86c1ec9a5a451f096cb79bc8ae68f7
# Version: 6cbcbd7491f215bb5fc8fef6e5210b0dc2366e9b
2 changes: 1 addition & 1 deletion master.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version = 1
sha1 = "c3e341a734f0938ab5352563db54d5db3137f766"

[build.profiling]
[build.profiling-7-10]
PROFILING = "true"
PUBLISH_PROFILING = "warden warden-gen"
GHC_VERSION="7.10.2"
Expand Down

0 comments on commit 7a5e8dc

Please sign in to comment.