Skip to content

Commit 9b990ee

Browse files
committed
Make pipenv play nice with the setup-python ci workflow
1 parent b2b36c8 commit 9b990ee

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,33 @@ on: [push, pull_request]
44

55
jobs:
66

7-
build-p36:
7+
run-tests:
88
runs-on: ubuntu-latest
99

10+
strategy:
11+
matrix:
12+
python-version: [ '3.6', '3.7' ]
13+
14+
name: Python ${{ matrix.python-version }} test
15+
1016
steps:
1117
- uses: actions/checkout@v1
1218
- uses: actions/setup-python@v1
1319
with:
14-
python-version: 3.6
20+
python-version: ${{ matrix.python-version }}
1521
- uses: dschep/install-pipenv-action@v1
1622
- name: Install dependencies
1723
run: |
1824
sudo apt install protobuf-compiler libprotobuf-dev
19-
pipenv install --dev
25+
pipenv install --dev --python ${pythonLocation}/python
2026
- name: Run tests
2127
run: |
2228
cp .env.default .env
2329
pipenv run pip install -e .
2430
pipenv run generate
2531
pipenv run test
2632
27-
build-p37:
33+
build-release:
2834
runs-on: ubuntu-latest
2935

3036
steps:
@@ -36,13 +42,7 @@ jobs:
3642
- name: Install dependencies
3743
run: |
3844
sudo apt install protobuf-compiler libprotobuf-dev
39-
pipenv install --dev
40-
- name: Run tests
41-
run: |
42-
cp .env.default .env
43-
pipenv run pip install -e .
44-
pipenv run generate
45-
pipenv run test
45+
pipenv install --dev --python ${pythonLocation}/python
4646
- name: Build package
4747
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
4848
run: pipenv run python setup.py sdist

0 commit comments

Comments
 (0)