From 9b990ee1bd9ee368df3e4119f0f4f23078ee6bd8 Mon Sep 17 00:00:00 2001
From: Nat Noordanus <n@natn.me>
Date: Sun, 5 Apr 2020 15:57:55 +0200
Subject: [PATCH] Make pipenv play nice with the setup-python ci workflow

---
 .github/workflows/ci.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a5ee387..fe6de5f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,19 +4,25 @@ on: [push, pull_request]
 
 jobs:
 
-  build-p36:
+  run-tests:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        python-version: [ '3.6', '3.7' ]
+
+    name: Python ${{ matrix.python-version }} test
+
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
         with:
-          python-version: 3.6
+          python-version: ${{ matrix.python-version }}
       - uses: dschep/install-pipenv-action@v1
       - name: Install dependencies
         run: |
           sudo apt install protobuf-compiler libprotobuf-dev
-          pipenv install --dev
+          pipenv install --dev --python ${pythonLocation}/python
       - name: Run tests
         run: |
           cp .env.default .env
@@ -24,7 +30,7 @@ jobs:
           pipenv run generate
           pipenv run test
 
-  build-p37:
+  build-release:
     runs-on: ubuntu-latest
 
     steps:
@@ -36,13 +42,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt install protobuf-compiler libprotobuf-dev
-          pipenv install --dev
-      - name: Run tests
-        run: |
-          cp .env.default .env
-          pipenv run pip install -e .
-          pipenv run generate
-          pipenv run test
+          pipenv install --dev --python ${pythonLocation}/python
       - name: Build package
         if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
         run: pipenv run python setup.py sdist