Avoid using version of onigurumacffi that is not binary packaged

Related: #396
ansible · Oct 4, 2024 · 8a1f79b · 8a1f79b
1 parent 5e849f8
commit 8a1f79b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 4 deletions.
diff --git 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/dictionary.txt b/.config/dictionary.txt
@@ -19,6 +19,7 @@ devfile
 endgroup
 gunicorn
 libera
+libonig
 microdnf
 mknod
 modifyitems

diff --git 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
@@ -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
@@ -22,6 +22,8 @@ concurrency:
 jobs:
   tox:
     uses: ansible/team-devtools/.github/workflows/tox.yml@main
+    with:
+      run_pre: ./tools/test-setup.sh
   build-image:
     runs-on: ${{ matrix.builder }}
     name: ${{ matrix.name }}
@@ -55,8 +57,9 @@ 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/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
@@ -0,0 +1,6 @@
+#!/bin/bash -e
+set -eux pipefail
+
+if [[ -f "/usr/bin/apt-get" ]]; then
+    apt install -y -q libonig-dev
+fi