Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .actrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
--workflows .github/act-serial.yaml
--platform js-20.04=ghcr.io/catthehacker/ubuntu:js-20.04
--platform ubuntu-20.04=ghcr.io/catthehacker/ubuntu:act-20.04
--workflows .github/workflows/main.yml
# Use this to run only specific variants of a matrix:
# -j test --matrix python-version:3.12 --matrix python-version:3.13
--platform ubuntu-22.04=ghcr.io/catthehacker/ubuntu:act-22.04
--platform ubuntu-24.04=ghcr.io/catthehacker/ubuntu:act-24.04
--platform ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest

# If using podman, use one of these, preferably in your ~/.actrc:
# For act-cli.rpm on Fedora 37:
# --container-daemon-socket /run/user/1000/podman/podman.sock
# For the latest act, use this in your ~/.actrc:
# --container-daemon-socket unix:///run/user/1000/podman/podman.sock
# More information on setting up act can be found at:
# https://github.com/xenserver/python-libs/blob/master/CONTRIBUTING.md#running-github-actions-locally-using-act
66 changes: 0 additions & 66 deletions .github/act-serial.yaml

This file was deleted.

17 changes: 8 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,26 @@ jobs:
with:
fetch-depth: 0 # Needed by diff-cover to get the changed lines: origin/master..HEAD
- name: Set up Python ${{ matrix.python-version }}
# Python 3.11 is not supported in the nektos/act container, so we skip this step
if: ${{ !(matrix.python-version == '3.11' && github.actor == 'nektos/act') }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Install Python 2.7 from Ubuntu 20.04 using apt-get install
if: ${{ matrix.os == 'ubuntu-20.04' }}
run: sudo apt-get update && sudo apt-get install -y python2-dev

- name: Install missing cpio in containers of nektos/act
if: ${{ github.actor == 'nektos/act'}}
if: ${{ (github.actor == 'nektos/act' && matrix.python-version != '3.11') }}
run: apt-get update && apt-get install -y cpio

- name: Run of tox on ubuntu-latest
if: ${{ startsWith(matrix.python-version, '3.') && matrix.python-version != 3.6 }}
- name: Run of tox on Ubuntu
# Python 3.11 is not supported in the nektos/act container, so we skip this step
if: ${{ !(matrix.python-version == '3.11' && github.actor == 'nektos/act') }}
run: |
pip install 'virtualenv<20.22' 'tox==4.5.1' tox-gh-actions
pip install tox tox-gh-actions
tox --workdir .github/workflows/.tox --recreate

- name: Select the coverage file for upload
if: |
( matrix.python-version == '3.6' || matrix.python-version == '3.11' ) &&
matrix.python-version == '3.11' &&
( !cancelled() && github.actor != 'nektos/act' )
id: coverage
run: mv $( ls -t .github/workflows/.tox/*/log/.coverage | head -1 ) .coverage
Expand Down
Loading