From 2ffd8d9d9bad9529f01dcbc433fc3b7a1e62f7e1 Mon Sep 17 00:00:00 2001
From: Jakub Roztocil <jakub@roztocil.co>
Date: Tue, 10 Sep 2019 13:10:29 +0200
Subject: [PATCH] workflow

---
 .github/workflows/pythonpackage.yml | 13 ++++++++++---
 Makefile                            | 10 +++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index 7afd59f3..23440718 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -17,8 +17,15 @@ jobs:
       uses: actions/setup-python@v1
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
+    - name: upgrade pip
+      run: python -m pip install --upgrade pip
+    - name: install
+      run: make install
     - name: test
       run: make test
+    - name: pycodestyle
+      if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.7'
+      run: make pycodestyle
+    - name: coveralls
+      if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.7'
+      run: make coveralls
diff --git a/Makefile b/Makefile
index 85ebafb5..544e37c2 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,10 @@ TAG="\n\n\033[0;32m\#\#\# "
 END=" \#\#\# \033[0m\n"
 
 
-all: test
+all: uninstall-httpie install test
 
 
-init: uninstall-httpie
+install:
 	@echo $(TAG)Installing dev requirements$(END)
 	pip install --upgrade -r $(REQUIREMENTS)
 
@@ -32,14 +32,14 @@ clean:
 ###############################################################################
 
 
-test: init
+test:
 	@echo $(TAG)Running tests on the current Python interpreter with coverage $(END)
 	py.test --cov ./httpie --cov ./tests --doctest-modules --verbose ./httpie ./tests
 	@echo
 
 
 # test-all is meant to test everything — even this Makefile
-test-all: uninstall-all clean init test test-tox test-dist pycodestyle
+test-all: uninstall-all clean install test test-tox test-dist pycodestyle
 	@echo
 
 
@@ -47,7 +47,7 @@ test-dist: test-sdist test-bdist-wheel
 	@echo
 
 
-test-tox: init
+test-tox: uninstall-httpie install
 	@echo $(TAG)Running tests on all Pythons via Tox$(END)
 	tox
 	@echo