Skip to content
This repository has been archived by the owner on Mar 23, 2023. It is now read-only.

Commit

Permalink
Clean up travis config, set up os x build (#143)
Browse files Browse the repository at this point in the history
* Remove dependence on pip.
* Add osx to Travis test matrix.
* Remove pip upgrade and sudo requirement for Travis config.
  • Loading branch information
trotterdylan committed Jan 18, 2017
1 parent 3dc695e commit d5c4e9e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
language: go
# Upgrade default Travis pip which is old and doesn't work the way we expect.
# Need sudo to do that.
sudo: required
install: pip install --upgrade pip
os:
- linux
- osx
# Run gofmt and lint serially to avoid confusing output. Run tests in parallel
# for speed.
script: make gofmt lint; make -j2 test
script: make gofmt lint && make -j2 test
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,15 @@ gofmt: build/gofmt.diff
$(GOLINT_BIN):
@go get -u github.com/golang/lint/golint

golint: $(GOLINT_BIN) $(PYLINT_BIN)
golint: $(GOLINT_BIN)
@$(GOLINT_BIN) -set_exit_status runtime

# Old versions of pip don't support the --prefix param so specify the bin dir
# (--install-scripts) and the Python dir (--target) separately.
# Don't use system pip for this since behavior varies a lot between versions.
# Instead build pylint from source. Dependencies will be fetched by distutils.
$(PYLINT_BIN):
@pip install --install-option=--install-scripts='$(ROOT_DIR)/build/bin' --target '$(PY_DIR)' pylint
@mkdir -p build/third_party
@cd build/third_party && curl -sL https://pypi.io/packages/source/p/pylint/pylint-1.6.4.tar.gz | tar -zx
@cd build/third_party/pylint-1.6.4 && $(PYTHON) setup.py install --prefix $(ROOT_DIR)/build

pylint: $(PYLINT_BIN)
@$(PYLINT_BIN) compiler/*.py $(addprefix tools/,benchcmp coverparse diffrange grumpc grumprun)
Expand Down

0 comments on commit d5c4e9e

Please sign in to comment.