Skip to content

Commit dd36940

Browse files
committed
build: build xapian on 3.12
See if xapian will build on github with 3.12rc2 using the standard build method. Removed override to 1.14.22 for 3.12 and enabled build rather than skipping on 3.12.
1 parent 3373b68 commit dd36940

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

.github/workflows/ci-test.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,7 @@ jobs:
189189
# older python and newest on newer.
190190
if [[ $PYTHON_VERSION == "2."* ]]; then pip install sphinx==1.8.5; fi
191191
if [[ $PYTHON_VERSION == '3.'* ]] ; then pip install sphinx; fi
192-
if [[ $PYTHON_VERSION == '3.12'* ]] ; then \
193-
XAPIAN_VER=1.4.22; \
194-
else
195-
XAPIAN_VER=$(dpkg -l libxapian-dev | tail -n 1 | awk '{print $3}' | cut -d '-' -f 1); echo $XAPIAN_VER; \
196-
fi
192+
XAPIAN_VER=$(dpkg -l libxapian-dev | tail -n 1 | awk '{print $3}' | cut -d '-' -f 1); echo $XAPIAN_VER
197193
cd /tmp
198194
curl -s -O https://oligarchy.co.uk/xapian/$XAPIAN_VER/xapian-bindings-$XAPIAN_VER.tar.xz
199195
tar -Jxvf xapian-bindings-$XAPIAN_VER.tar.xz
@@ -205,7 +201,7 @@ jobs:
205201
# Change distutils.sysconfig... to just sysconfig and SO
206202
# to EXT_SUFFIX to get valid value.
207203
if [[ $PYTHON_VERSION == "3."* ]]; then sed -i -e '/PYTHON3_SO=/s/distutils\.//g' -e '/PYTHON3_SO=/s/"SO"/"EXT_SUFFIX"/g' configure; ./configure --prefix=$VIRTUAL_ENV --with-python3 --disable-documentation; fi
208-
case "$PYTHON_VERSION" in nightly|3.12*) echo skipping xapian build;; *) make && sudo make install; esac
204+
case "$PYTHON_VERSION" in nightly) echo skipping xapian build;; *) make && sudo make install; esac
209205
210206
- name: Install pytest and other packages needed for running tests
211207
run: pip install flake8 mock pytest pytest-cov requests

0 commit comments

Comments
 (0)