Author: brane
Date: Wed May 27 07:46:26 2026
New Revision: 1934675
Log:
Be more specific about the Python binary used by the autotools workflow.
Modified:
subversion/trunk/.github/workflows/autoconf.yml
Modified: subversion/trunk/.github/workflows/autoconf.yml
==============================================================================
--- subversion/trunk/.github/workflows/autoconf.yml Wed May 27 07:43:19
2026 (r1934674)
+++ subversion/trunk/.github/workflows/autoconf.yml Wed May 27 07:46:26
2026 (r1934675)
@@ -92,10 +92,8 @@ jobs:
- name: Install dependencies (macOS, python)
if: runner.os == 'macOS'
- id: python
run: |
python3 -m venv ./.venv
- echo "venv=$(cd ./.venv && pwd)" >> "$GITHUB_OUTPUT"
./.venv/bin/python3 -m pip \
--disable-pip-version-check \
install lxml==6.1.0 rnc2rng==2.7.0
@@ -117,20 +115,35 @@ jobs:
make install
- uses: actions/checkout@v6
+ id: python
+ run: |
+ if test "$(uname -o)" = "Darwin"; then
+ echo "python=$(cd ./.venv && pwd)/bin/python3" >>
"$GITHUB_OUTPUT"
+ else
+ which python3 >> "$GITHUB_OUTPUT"
+ fi
+
- name: autogen
+ env:
+ PYTHON: ${{ steps.python.outputs.python }}
run: ./autogen.sh
- name: Configure (Linux)
if: runner.os == 'Linux'
+ env:
+ PYTHON: ${{ steps.python.outputs.python }}
run: |
./configure --enable-maintainer-mode \
--with-apxs=${{ matrix.httpd == 'system' && '/usr/bin/apxs' ||
'${HOME}/root/httpd/bin/apxs' }}
- name: Configure (macOS)
if: runner.os == 'macOS'
+ env:
+ CC: clang
+ CXX: clang++
+ PYTHON: ${{ steps.python.outputs.python }}
run: |
- env CC=clang CXX=clang++ \
- PYTHON="${{ steps.python.outputs.venv }}/bin/python3" \
+ export PATH="$(dirname "$PYTHON"):$PATH"
./configure --enable-maintainer-mode \
--disable-nls \
--enable-keychain \
@@ -141,16 +154,16 @@ jobs:
--with-sqlite="$(brew --prefix sqlite)" \
--with-lz4="$(brew --prefix lz4)" \
--with-utf8proc="$(brew --prefix utf8proc)" \
+ --without-libmagic \
--without-apxs \
--without-berkeley-db \
- --without-swig \
- --without-libmagic
+ --without-swig
- name: Build (make)
run: make -j4
- name: Run tests
- run: make ${{matrix.check-target}} PARALLEL=16 APACHE_MPM=event
+ run: make ${{matrix.check-target}} PARALLEL=16 APACHE_MPM=event
PYTHON_VENV=./venv
- name: Archive test logs
if: always()
