Skip to content

Commit e1a2e80

Browse files
committed
Run 2.7 tests on <=20.04
1 parent 6a4f0db commit e1a2e80

1 file changed

Lines changed: 13 additions & 15 deletions

File tree

.github/workflows/unittests.yml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ jobs:
5858
- name: Run mypy
5959
run: tox -e mypy
6060

61+
# https://github.com/actions/runner-images/issues/6399
62+
# Python 2.7 tests must be run on ubuntu <= 20.04
6163
utscapy:
6264
name: ${{ matrix.os }} ${{ matrix.installmode }} ${{ matrix.python }} ${{ matrix.mode }} ${{ matrix.flags }}
6365
runs-on: ${{ matrix.os }}
@@ -67,27 +69,23 @@ jobs:
6769
fail-fast: false
6870
matrix:
6971
os: [ubuntu-latest]
70-
python: ["2.7", "3.10"]
71-
mode: [both]
72+
python: ["3.7", "3.8", "3.9", "3.10"]
73+
mode: [non_root]
7274
installmode: ['']
7375
flags: ['']
7476
allow-failure: [false]
7577
include:
76-
# Linux non-root only tests
77-
- os: ubuntu-latest
78-
python: "3.7"
79-
mode: non_root
80-
allow-failure: false
81-
- os: ubuntu-latest
82-
python: "3.8"
83-
mode: non_root
78+
# Linux root tests
79+
- os: ubuntu-20.04
80+
python: "2.7"
81+
mode: root
8482
allow-failure: false
8583
- os: ubuntu-latest
86-
python: "3.9"
87-
mode: non_root
84+
python: "3.10"
85+
mode: root
8886
allow-failure: false
8987
# PyPy tests: root only
90-
- os: ubuntu-latest
88+
- os: ubuntu-20.04
9189
python: "pypy2.7"
9290
mode: root
9391
allow-failure: false
@@ -112,7 +110,8 @@ jobs:
112110
python: "3.10"
113111
mode: both
114112
allow-failure: false
115-
- os: ubuntu-latest
113+
# Scanner tests
114+
- os: ubuntu-20.04
116115
python: "pypy2.7"
117116
mode: root
118117
allow-failure: true
@@ -122,7 +121,6 @@ jobs:
122121
mode: root
123122
allow-failure: true
124123
flags: " -k scanner"
125-
# MacOS tests
126124
- os: macos-12
127125
python: "3.10"
128126
mode: both

0 commit comments

Comments
 (0)