From f7091d5273a1a1abb12941ca6c4d5c28dbf9646f Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Wed, 18 Dec 2019 11:13:23 +1000 Subject: [PATCH] update travis to use makefile --- .travis.py36.sh | 12 ------------ .travis.py37.sh | 13 ------------- .travis.yml | 4 ++-- 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100755 .travis.py36.sh delete mode 100755 .travis.py37.sh diff --git a/.travis.py36.sh b/.travis.py36.sh deleted file mode 100755 index 4770d7e57..000000000 --- a/.travis.py36.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -e - -echo "building ui..." -./tools/build_ui.sh - -echo "running unit tests..." -nosetests ./tests - -echo "linting..." -./tools/lint.sh diff --git a/.travis.py37.sh b/.travis.py37.sh deleted file mode 100755 index 653f6baa4..000000000 --- a/.travis.py37.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -e - -echo "building ui..." -./tools/build_ui.sh - -echo "running unit tests..." -nosetests ./tests - -echo "type checking..." -./tools/typecheck-setup.sh -./tools/typecheck.sh diff --git a/.travis.yml b/.travis.yml index b7aac5399..e6a9c55cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,6 @@ install: jobs: include: - python: 3.6 - script: ./.travis.py36.sh + script: make -j 4 test lint mypy - python: 3.7 - script: ./.travis.py37.sh + script: ./tools/typecheck-setup.sh && make -j 4 check