Skip to content

Commit 28a7dc3

Browse files
committed
cleanup special case - xapian doesn't build in CI for 3.13 python
Remove python version checks from xapian script. Keep if: clause that skips xapian install on 3.13 until we are on ubuntu-24.04 image. python xapian binding for 1.4.22 looks like it builds correctly on 24.04. https://github.com/roundup-tracker/roundup/actions/runs/11784123806/job/32822658400 [skip travis]
1 parent 1d5c9f3 commit 28a7dc3

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

.github/workflows/ci-test.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,9 @@ jobs:
256256
pip install Markdown; fi
257257
258258
- name: Install xapian
259+
# comment the if: line out once we start running on
260+
# ubuntu-24.04. 24.04 has xapian 1.4.22 which builds
261+
# correctly with python 3.13.
259262
if: matrix.python-version != '3.13'
260263
run: |
261264
set -xv
@@ -264,11 +267,7 @@ jobs:
264267
# older python and newest on newer.
265268
if [[ $PYTHON_VERSION == "2."* ]]; then pip install sphinx==1.8.5; fi
266269
if [[ $PYTHON_VERSION == '3.'* ]] ; then pip install sphinx; fi
267-
if [[ $PYTHON_VERSION != "3.13" ]]; then
268-
XAPIAN_VER=$(dpkg -l libxapian-dev | tail -n 1 | awk '{print $3}' | cut -d '-' -f 1); echo $XAPIAN_VER;
269-
else
270-
XAPIAN_VER="1.4.25"; echo $XAPIAN_VER;
271-
fi
270+
XAPIAN_VER=$(dpkg -l libxapian-dev | tail -n 1 | awk '{print $3}' | cut -d '-' -f 1); echo $XAPIAN_VER;
272271
cd /tmp
273272
curl -s -O https://oligarchy.co.uk/xapian/$XAPIAN_VER/xapian-bindings-$XAPIAN_VER.tar.xz
274273
tar -Jxvf xapian-bindings-$XAPIAN_VER.tar.xz
@@ -291,7 +290,7 @@ jobs:
291290
diff -u configure.FCS configure || true; \
292291
./configure --prefix=$VIRTUAL_ENV --with-python3 --disable-documentation; \
293292
fi
294-
case "$PYTHON_VERSION" in "3.13") echo skipping xapian build;; *) make && sudo make install; esac
293+
make && sudo make install
295294
296295
- name: Test build roundup and install locale so lang tests work.
297296
run: |

0 commit comments

Comments
 (0)