Skip to content

build: improve makefile usage + parallelism #5662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcramer merged 1 commit into from
Jun 30, 2017
Merged

build: improve makefile usage + parallelism #5662

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 29 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
CPUS ?= $(shell sysctl -n hw.ncpu || echo 1)
Copy link
Contributor

@mattrobenolt mattrobenolt Jun 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like how this only works on OSX. I think you'll break it in Travis. Or I guess just fall back to 1.

Copy link
Member Author

@dcramer dcramer Jun 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah we could probably tweak it, but i was mostly focused on making it faster in dev

MAKEFLAGS += --jobs=$(CPUS)
NPM_ROOT = ./node_modules
STATIC_DIR = src/sentry/static/sentry

install-python:
@echo "--> Installing Python dependencies"
pip install "setuptools>=0.9.8"
# order matters here, base package must install first
pip install -e .
pip install ujson
pip install "file://`pwd`#egg=sentry[dev]"
develop: setup-git update-submodules install-python install-yarn
@echo ""

develop-only: develop

install-yarn:
@echo "--> Installing Node dependencies"
Expand All @@ -18,13 +17,21 @@ install-yarn:
# See: https://github.com/karma-runner/karma-phantomjs-launcher/issues/120#issuecomment-262634703
node ./node_modules/phantomjs-prebuilt/install.js

install-python-tests:
pip install "file://`pwd`#egg=sentry[dev,tests,dsym]"
install-python:
# must be executed serialially
$(MAKE) install-python-base
$(MAKE) install-python-tests

develop-only: update-submodules install-python install-python-tests install-yarn
install-python-base:
@echo "--> Installing Python dependencies"
pip install "setuptools>=0.9.8"
# order matters here, base package must install first
pip install -e .
pip install ujson
pip install "file://`pwd`#egg=sentry[dev]"

develop: develop-only setup-git
@echo ""
install-python-tests:
pip install "file://`pwd`#egg=sentry[dev,tests,dsym]"

dev-postgres: install-python

Expand Down Expand Up @@ -136,7 +143,7 @@ lint-js:
@echo ""

coverage: develop
make test-python-coverage
$(MAKE) test-python-coverage
coverage html

publish:
Expand All @@ -160,7 +167,9 @@ travis-upgrade-pip:
travis-setup-cassandra:
echo "create keyspace sentry with replication = {'class' : 'SimpleStrategy', 'replication_factor': 1};" | cqlsh --cqlversion=3.1.7
echo 'create table nodestore (key text primary key, value blob, flags int);' | cqlsh -k sentry --cqlversion=3.1.7
travis-install-python: travis-upgrade-pip install-python install-python-tests
travis-install-python:
$(MAKE) travis-upgrade-pip
$(MAKE) install-python install-python
python -m pip install codecov
travis-noop:
@echo "nothing to do here."
Expand All @@ -176,9 +185,13 @@ travis-install-mysql: travis-install-python
pip install mysqlclient
echo 'create database sentry;' | mysql -uroot
travis-install-acceptance: install-yarn travis-install-postgres
travis-install-js: travis-upgrade-pip install-python install-python-tests install-yarn
travis-install-js:
$(MAKE) travis-upgrade-pip
$(MAKE) install-python install-yarn
travis-install-cli: travis-install-postgres
travis-install-dist: travis-upgrade-pip install-python install-python-tests install-yarn
travis-install-dist:
$(MAKE) travis-upgrade-pip
$(MAKE) install-python install-yarn
travis-install-django-18: travis-install-postgres
pip install "Django>=1.8,<1.9"

Expand Down