From abe4f609f2d7ced61011a8282e7c68d949d396b2 Mon Sep 17 00:00:00 2001 From: John Rouillard Date: Wed, 18 Dec 2024 20:22:58 -0500 Subject: [PATCH] issue251338 - xapian doesn't build in CI for 3.13 python ubuntu-latest is ubunut-24.04. so re-enable xapian install for 3.13. Also remove include for python-3.12/ ubuntu-24.04 as -latest covers it. Clean up excludes as only python-latest is used and exclude is used for named version not the actual version (ubuntu-latest is not excluded by ubuntu-24.04 even thugh that's it's actual version). --- .github/workflows/ci-test.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index d2e5e4b4..8a3831de 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -65,7 +65,7 @@ jobs: #os: [ubuntu-latest, macos-latest, windows-latest] # ubuntu latest 22.04 12/2022 # ubuntu latest 24.04 12/2024 - os: [ubuntu-24.04, ubuntu-latest, ubuntu-20.04] + os: [ubuntu-latest] # if the ones above fail. fail the build experimental: [ false ] @@ -78,10 +78,6 @@ jobs: # os: ubuntu-22.04 # experimental: true - # test on new default 24.04 runner 3.12 for 24.04 - - python-version: 3.12 - os: ubuntu-24.04 - # 3.6 not available on new 22.04 runners, so run on 20.04 ubuntu - python-version: 3.6 os: ubuntu-20.04 @@ -91,10 +87,10 @@ jobs: os: ubuntu-22.04 exclude: - # skip all python versions on 20.04/24.04 except + # skip all python versions on explicit 20.04/24.04 unless # explicitly included - - os: ubuntu-20.04 - - os: ubuntu-24.04 + #- os: ubuntu-20.04 + #- os: ubuntu-24.04 # disable when testing ubuntu-24.04 to speed up # runs. @@ -256,10 +252,6 @@ jobs: pip install Markdown; fi - name: Install xapian - # comment the if: line out once we start running on - # ubuntu-24.04. 24.04 has xapian 1.4.22 which builds - # correctly with python 3.13. - if: matrix.python-version != '3.13' run: | set -xv sudo apt-get install libxapian-dev