Skip to content

Commit

Permalink
Merge pull request #40 from ministryofjustice/feature/circleci
Browse files Browse the repository at this point in the history
LGA-95 Feature/circleci
  • Loading branch information
farrepa committed Jan 3, 2019
2 parents db2b1c8 + 19d8644 commit d9808a1
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 45 deletions.
35 changes: 35 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
version: 2
jobs:
test:
docker:
- image: circleci/python:2.7
steps:
- checkout
- run:
name: Setup Python environment
command: |
pip install virtualenv
virtualenv env-ci
- restore_cache:
keys:
- pip-v2-{{ checksum "requirements.txt" }}-{{ checksum "requirements-test.txt" }}
- run:
name: Install dependencies
command: |
source env-ci/bin/activate
pip install -r requirements-test.txt
- save_cache:
key: pip-v2-{{ checksum "requirements.txt" }}-{{ checksum "requirements-test.txt" }}
paths:
- "~/.cache/pip"
- run:
name: Run tests
command: |
source env-ci/bin/activate
coverage run --source cla_common runtests.py
coveralls
workflows:
version: 2
test:
jobs:
- test
6 changes: 4 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
cla_common
==========

.. image:: https://coveralls.io/repos/ministryofjustice/cla_common/badge.png?branch=master
.. image:: https://coveralls.io/repos/ministryofjustice/cla_common/badge.svg?branch=master
:target: https://coveralls.io/r/ministryofjustice/cla_common?branch=master

.. image:: https://circleci.com/gh/ministryofjustice/cla_common.svg?style=shield
:target: https://circleci.com/gh/ministryofjustice/cla_common

Documentation
-------------
Expand All @@ -29,7 +31,7 @@ How to make changes
-------------------
1. Create a feature branch
2. Make your changes
3. Check if the build job and tests pass on Jenkins
3. Check if the build job and tests pass on CircleCI
4. Submit a pull request
5. merge it (ask for a code review if you did anything scary)
6. Once code is merged, pull develop branch
Expand Down
43 changes: 0 additions & 43 deletions scripts/jenkins/build.py

This file was deleted.

0 comments on commit d9808a1

Please sign in to comment.