Skip to content

Commit

Permalink
Address onigurumacffi installation failure
Browse files Browse the repository at this point in the history
Related: #396
  • Loading branch information
ssbarnea committed Oct 6, 2024
1 parent 5e849f8 commit 425c94e
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 4 deletions.
1 change: 1 addition & 0 deletions .config/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ devfile
endgroup
gunicorn
libera
libonig
microdnf
mknod
modifyitems
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions bindep.txt
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
python3-devel [platform:redhat]
oniguruma-devel [test platform:rpm]
libonig-dev [test platform:dpkg]
6 changes: 6 additions & 0 deletions tools/test-setup.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
requires =
tox>=4.11.3
tox-extra>=2.0.1
tox-extra>=2.0.2
env_list =
py
deps
Expand Down

0 comments on commit 425c94e

Please sign in to comment.