diff --git a/.config/dictionary.txt b/.config/dictionary.txt index 8a29aad..ccde71e 100644 --- a/.config/dictionary.txt +++ b/.config/dictionary.txt @@ -19,6 +19,7 @@ devfile endgroup gunicorn libera +libonig microdnf mknod modifyitems diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 3aff96a..88ab616 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -22,6 +22,10 @@ concurrency: jobs: tox: uses: ansible/team-devtools/.github/workflows/tox.yml@main + with: + run_pre: ./tools/test-setup.sh + other_names: "" + jobs_producing_coverage: 5 build-image: runs-on: ${{ matrix.builder }} name: ${{ matrix.name }} @@ -55,8 +59,10 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Prune docker system - run: sudo ./final/docker-prune.sh + - name: Setup runner + run: | + ./tools/test-setup.sh + sudo ./final/docker-prune.sh - name: Build the container image for ${{ matrix.platform }} and test it uses: ./.github/actions/build-test diff --git a/.readthedocs.yml b/.readthedocs.yml index 78a84d9..2dfb120 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -11,7 +11,7 @@ build: python: "3.11" commands: - pip install --user tox - - python3 -m tox -e docs -- --strict --site-dir=_readthedocs/html/ + - TOX_EXTRA_BINDEP=0 python3 -m tox -e docs -- --strict --site-dir=_readthedocs/html/ python: install: - method: pip diff --git a/bindep.txt b/bindep.txt index afcdc5e..8b64e4b 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1 +1,3 @@ python3-devel [platform:redhat] +oniguruma-devel [test platform:rpm] +libonig-dev [test platform:dpkg] diff --git a/tools/test-setup.sh b/tools/test-setup.sh new file mode 100755 index 0000000..b382f7a --- /dev/null +++ b/tools/test-setup.sh @@ -0,0 +1,6 @@ +#!/bin/bash -e +set -eux pipefail + +if [[ -f "/usr/bin/apt-get" ]]; then + sudo apt-get install -y -q libonig-dev +fi diff --git a/tox.ini b/tox.ini index 8b1fbf6..f7fd742 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] requires = tox>=4.11.3 - tox-extra>=2.0.1 + tox-extra>=2.0.2 env_list = py deps