From 7051f8856b5b7bab002802dc9a866e4bc5bc5c36 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Wed, 2 Oct 2024 13:19:30 +0100
Subject: [PATCH] Avoid using version of onigurumacffi that is not binary
 packaged

Related: https://github.com/ansible/ansible-dev-tools/issues/396
---
 .config/constraints.txt       | 2 +-
 .config/requirements-lock.txt | 2 +-
 .github/dependabot.yml        | 2 ++
 .github/workflows/tox.yml     | 3 +++
 bindep.txt                    | 2 ++
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.config/constraints.txt b/.config/constraints.txt
index 0c993285..175c4e3f 100644
--- a/.config/constraints.txt
+++ b/.config/constraints.txt
@@ -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
diff --git a/.config/requirements-lock.txt b/.config/requirements-lock.txt
index c47b712e..79acfd9d 100644
--- a/.config/requirements-lock.txt
+++ b/.config/requirements-lock.txt
@@ -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
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e6b5ebcf..abfa49f0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -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:
diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 3aff96aa..caa68784 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -22,6 +22,9 @@ concurrency:
 jobs:
   tox:
     uses: ansible/team-devtools/.github/workflows/tox.yml@main
+    with:
+      run_pre: |
+        sudo apt install -y -q libonig-dev
   build-image:
     runs-on: ${{ matrix.builder }}
     name: ${{ matrix.name }}
diff --git a/bindep.txt b/bindep.txt
index afcdc5e7..8b64e4b8 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1 +1,3 @@
 python3-devel [platform:redhat]
+oniguruma-devel [test platform:rpm]
+libonig-dev [test platform:dpkg]