Skip to content

Commit

Permalink
Avoid using version of onigurumacffi that is not binary packaged
Browse files Browse the repository at this point in the history
Related: #396
  • Loading branch information
ssbarnea committed Oct 4, 2024
1 parent 5e849f8 commit 0ae5e32
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .config/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ more-itertools==10.5.0
mypy==1.11.2
mypy-extensions==1.0.0
nodeenv==1.9.1
onigurumacffi==1.3.0
onigurumacffi==1.2.0
openapi-core==0.19.4
openapi-schema-validator==0.6.2
openapi-spec-validator==0.7.1
Expand Down
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
2 changes: 1 addition & 1 deletion .config/requirements-lock.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ mdurl==0.1.2
molecule==24.9.0
more-itertools==10.5.0
mypy-extensions==1.0.0
onigurumacffi==1.3.0
onigurumacffi==1.2.0
openapi-core==0.19.4
openapi-schema-validator==0.6.2
openapi-spec-validator==0.7.1
Expand Down
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ updates:
- pytest-ansible
- referencing # https://github.com/p1c2u/jsonschema-path/issues/143
- tox-ansible
- onigurumacffi # https://github.com/ansible/ansible-dev-tools/issues/396
ignore:
- dependency-name: referencing
- dependency-name: onigurumacffi # https://github.com/ansible/ansible-dev-tools/issues/396
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ concurrency:
jobs:
tox:
uses: ansible/team-devtools/.github/workflows/tox.yml@main
with:
run_pre: ./tools/test-setup.sh
jobs_producing_coverage: 0
build-image:
runs-on: ${{ matrix.builder }}
name: ${{ matrix.name }}
Expand Down Expand Up @@ -55,8 +58,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: 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

0 comments on commit 0ae5e32

Please sign in to comment.