Skip to content

Commit

Permalink
Don't use CI on some commits [fixes lspector#179]
Browse files Browse the repository at this point in the history
  • Loading branch information
saulshanabrook committed Dec 14, 2015
1 parent b2c14c6 commit d4da485
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 15 deletions.
7 changes: 4 additions & 3 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
[clojure-csv "2.0.1"]
[org.clojure/data.json "0.2.6"]
[clj-random "0.1.7"]]
:plugins [[codox "0.8.14"]]
:plugins [[codox "0.8.14"]
[lein-shell "0.5.0"]]
:codox {:src-dir-uri "http://github.com/lspector/Clojush/blob/master/"
:src-linenum-anchor-prefix "L"
; :exclude #"^clojush\.problems\."
Expand All @@ -26,11 +27,11 @@
:password :env}]]
:release-tasks [["vcs" "assert-committed"]
["change" "version" "leiningen.release/bump-version" "release"]
["vcs" "commit"]
["shell" "git" "commit" "-am" "Version ${:version} [ci skip]"]
["vcs" "tag" "v" "--no-sign"] ; disable signing and add "v" prefix
["deploy"]
["change" "version" "leiningen.release/bump-version"]
["vcs" "commit"]
["shell" "git" "commit" "-am" "Version ${:version} [ci skip]"]
["vcs" "push"]]
;;;;;;;;;; jvm settings for high performance, using most of the machine's RAM
; :jvm-opts ~(let [mem-to-use
Expand Down
11 changes: 0 additions & 11 deletions scripts/after_success.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,9 @@ set -o nounset
set -o xtrace
set -o pipefail

LAST_COMMIT_AUTHOR_EMAIL=$(git --no-pager show -s --format='%ae' HEAD)
echo "last commit ID: $LAST_COMMIT_AUTHOR_EMAIL"
AUTOMATED_AUTHOR_EMAIL=_@_._
AUTOMATED_AUTHOR_NAME=_

# if this commit was a created automatically (by lein release) then we dont
# wanna re release it. If it is, exit.
test $TRAVIS_PULL_REQUEST == "false" && \
test $TRAVIS_BRANCH == "master" &&
test $LAST_COMMIT_AUTHOR_EMAIL != $AUTOMATED_AUTHOR_EMAIL

git remote set-url origin https://$GITHUB_TOKEN@github.com/$TRAVIS_REPO_SLUG.git
git branch --set-upstream-to origin/master master
git config user.name "$AUTOMATED_AUTHOR_NAME"
Expand All @@ -25,7 +17,4 @@ git config push.default simple
lein doc 2>&1 | head -n 100
./scripts/deploy-docs.sh --verbose
git checkout master
git status
git branch
lein release
git tag
2 changes: 1 addition & 1 deletion scripts/deploy-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# modified from https://github.com/X1011/git-directory-deploy/raw/master/deploy.sh
# changed to support automatically intializing, if it deteched the remote branch didnt exist

set -o errexit #abort if any command fails
set -o errexit # abort if any command fails

main() {
deploy_directory=${GIT_DEPLOY_DIR:-doc}
Expand Down

0 comments on commit d4da485

Please sign in to comment.