Skip to content

Commit

Permalink
Fix Makefile and circleci configuration
Browse files Browse the repository at this point in the history
* Cleanup Makefile to handle our most common operations
* Fix circleci config to ignore gh-pages repo
  • Loading branch information
kfdm committed Jun 26, 2018
1 parent fef9b9c commit dfe842a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 17 deletions.
8 changes: 3 additions & 5 deletions .circleci/config.yml
@@ -1,6 +1,9 @@
version: 2
jobs:
build:
branches:
ignore:
- gh-pages
docker:
- image: python:3.5.3-alpine
environment:
Expand All @@ -13,8 +16,3 @@ jobs:
- run: codecov
- store_test_results:
path: test-results

general:
branches:
ignore:
- gh-pages
23 changes: 11 additions & 12 deletions Makefile
@@ -1,21 +1,20 @@
.PHONY: build up down shell test worker web docs
up:
docker-compose up
.PHONY: test
test: .venv
.venv/bin/promgen test


.PHONY: build
build:
docker-compose build

down:
docker-compose down

clean: down
docker-compose rm

.PHONY: shell
shell:
docker-compose run --rm worker bash

test:
docker-compose run base promgen test
.venv:
python3 -m venv .venv
.venv/bin/pip install -e .[dev,docs]

docs:
.PHONY: docs
docs: .venv
.venv/bin/sphinx-build -avb html docs dist/html

0 comments on commit dfe842a

Please sign in to comment.