Skip to content

Commit 2f45e79

Browse files
authored
Merge pull request #95 from pytest-dev/altendky-patch-1
Use official Docker images in Linux
2 parents 9d701e8 + 0dbed83 commit 2f45e79

File tree

1 file changed

+23
-0
lines changed

1 file changed

+23
-0
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,57 @@ jobs:
1717
test:
1818
name: ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.reactor.name }}
1919
runs-on: ${{ matrix.os.runs-on }}
20+
container: ${{ matrix.os.container[matrix.python.docker] }}
2021
strategy:
2122
fail-fast: false
2223
matrix:
2324
os:
2425
- name: Linux
2526
runs-on: ubuntu-latest
27+
python_platform: linux
28+
container:
29+
2.7: docker://python:2.7-buster
30+
3.5: docker://python:3.5-buster
31+
3.6: docker://python:3.6-buster
32+
3.7: docker://python:3.7-buster
33+
3.8: docker://python:3.8-buster
2634
- name: Windows
2735
runs-on: windows-latest
36+
python_platform: win32
2837
- name: macOS
2938
runs-on: macos-latest
39+
python_platform: darwin
3040
python:
3141
- name: CPython 2.7
3242
tox: py27
3343
action: 2.7
44+
docker: 2.7
3445
- name: CPython 3.5
3546
tox: py35
3647
action: 3.5
48+
docker: 3.5
3749
- name: CPython 3.6
3850
tox: py36
3951
action: 3.6
52+
docker: 3.6
4053
- name: CPython 3.7
4154
tox: py37
4255
action: 3.7
56+
docker: 3.7
4357
- name: CPython 3.8
4458
tox: py38
4559
action: 3.8
60+
docker: 3.8
4661
reactor:
4762
- name: default
4863
tox: default
64+
dependencies: default
4965
- name: Qt5
5066
tox: qt5
67+
dependencies: qt5
5168
- name: asyncio
5269
tox: asyncio
70+
dependencies: asyncio
5371
exclude:
5472
- python:
5573
tox: py27
@@ -66,6 +84,11 @@ jobs:
6684
with:
6785
python-version: ${{ matrix.python.action }}
6886
architecture: x64
87+
- name: Install Linux Qt5 dependencies
88+
if: matrix.os.python_platform == 'linux' && matrix.reactor.dependencies == 'qt5'
89+
run: |
90+
apt-get update --yes
91+
apt-get install --yes libgl1
6992
- name: Install
7093
run: |
7194
pip install tox

0 commit comments

Comments
 (0)