Skip to content

Commit

Permalink
Merge branch 'circle'
Browse files Browse the repository at this point in the history
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
  • Loading branch information
technomancy committed May 26, 2017
2 parents c968fa5 + 9874ce6 commit bcfeee5
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 6 deletions.
20 changes: 20 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: 2
jobs:
build:
working_directory: ~/leiningen
docker:
- image: clojure:lein-2.7.1
steps:
- checkout
- restore_cache:
key: << checksum "project.clj" >>
- run:
working_directory: ~/leiningen/leiningen-core
command: lein bootstrap
- run: bin/lein test
- save_cache:
paths:
- $HOME/.m2
- $HOME/.lein
key: << checksum "project.clj" >>

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@
TAGS
test_projects/*/target
pom.xml
deps.txt
9 changes: 3 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ when sending pull requests rather than committing directly to master
in order to minimize unnecessary merge commit clutter. Direct pull
requests towards the master branch, not the stable branch.

Leiningen is [mirrored at Gitorious](https://gitorious.org/leiningen/leiningen)
and [tested on Travis](http://travis-ci.org/technomancy/leiningen).
Leiningen is [mirrored at GitLab](https://gitlab.org/technomancy/leiningen)
and [tested on CircleCI](https://circleci.com/gh/technomancy/leiningen).

## Codebase

Expand Down Expand Up @@ -57,10 +57,7 @@ tasks. Assuming you are in Leiningen's project root, you can do that like this:

```bash
$ cd leiningen-core
$ lein bootstrap
$ cd ..
$ bin/lein compile
## or the bat file on Windows.
$ lein bootstrap # or lein.bat on Windows.
```

The `lein` command is a stable release of Leiningen on your `$PATH` – preferably
Expand Down

0 comments on commit bcfeee5

Please sign in to comment.