Skip to content

Commit 31d4c3a

Browse files
GitHub CI: Remove obsolete Py2.7/3.6 workflow steps, support nektos/act
Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>
1 parent 37751fd commit 31d4c3a

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

.github/workflows/main.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,26 @@ jobs:
4040
with:
4141
fetch-depth: 0 # Needed by diff-cover to get the changed lines: origin/master..HEAD
4242
- name: Set up Python ${{ matrix.python-version }}
43+
# Python 3.11 is not supported in the nektos/act container, so we skip this step
44+
if: ${{ !(matrix.python-version == '3.11' && github.actor == 'nektos/act') }}
4345
uses: actions/setup-python@v5
4446
with:
4547
python-version: ${{ matrix.python-version }}
4648

47-
- name: Install Python 2.7 from Ubuntu 20.04 using apt-get install
48-
if: ${{ matrix.os == 'ubuntu-20.04' }}
49-
run: sudo apt-get update && sudo apt-get install -y python2-dev
50-
5149
- name: Install missing cpio in containers of nektos/act
52-
if: ${{ github.actor == 'nektos/act'}}
50+
if: ${{ (github.actor == 'nektos/act' && matrix.python-version != '3.11') }}
5351
run: apt-get update && apt-get install -y cpio
5452

55-
- name: Run of tox on ubuntu-latest
56-
if: ${{ startsWith(matrix.python-version, '3.') && matrix.python-version != 3.6 }}
53+
- name: Run of tox on Ubuntu
54+
# Python 3.11 is not supported in the nektos/act container, so we skip this step
55+
if: ${{ !(matrix.python-version == '3.11' && github.actor == 'nektos/act') }}
5756
run: |
58-
pip install 'virtualenv<20.22' 'tox==4.5.1' tox-gh-actions
57+
pip install tox tox-gh-actions
5958
tox --workdir .github/workflows/.tox --recreate
6059
6160
- name: Select the coverage file for upload
6261
if: |
63-
( matrix.python-version == '3.6' || matrix.python-version == '3.11' ) &&
62+
matrix.python-version == '3.11' &&
6463
( !cancelled() && github.actor != 'nektos/act' )
6564
id: coverage
6665
run: mv $( ls -t .github/workflows/.tox/*/log/.coverage | head -1 ) .coverage

0 commit comments

Comments
 (0)