Skip to content

Commit cb9873f

Browse files
committed
Improve test coverage.
1 parent e89f86b commit cb9873f

File tree

2 files changed

+47
-60
lines changed

2 files changed

+47
-60
lines changed

.github/workflows/test-ubuntu-py2.yml

Lines changed: 0 additions & 58 deletions
This file was deleted.

.github/workflows/test-ubuntu.yml

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,21 @@ jobs:
1717
cxx: [g++, clang++]
1818
std: [c++11, c++14, c++17]
1919
include:
20+
- python-version: '2.7'
21+
cxx: g++
22+
std: c++11
23+
- python-version: '3.10'
24+
cxx: g++
25+
std: c++17
26+
- python-version: '3.11'
27+
cxx: g++
28+
std: c++17
29+
- python-version: '3.12'
30+
cxx: g++
31+
std: c++17
32+
- python-version: '3.13'
33+
cxx: g++
34+
std: c++17
2035
# Also test with free-threaded build of Python
2136
- python-version: '3.14t'
2237
cxx: clang++
@@ -34,16 +49,46 @@ jobs:
3449
steps:
3550
- uses: actions/checkout@v5
3651
- name: setup python
52+
if: "${{ matrix.python-version != '2.7' }}"
3753
uses: actions/setup-python@v5
3854
with:
3955
python-version: ${{ matrix.python-version }}
4056
- name: setup prerequisites
57+
# Warning: this is not necessarily the same Python version as the one configured above !
58+
python3 -m pip install -U faber --break-system-packages
4159
run: |
4260
echo "CXX=${{ matrix.cxx }}" >> "$GITHUB_ENV"
4361
echo "CXX_STD=${{ matrix.std }}" >> "$GITHUB_ENV"
44-
- name: build
62+
- name: build-py2
63+
if: "${{ matrix.python-version == '2.7' }}"
64+
run: |
65+
python --version
66+
${{ matrix.cxx }} --version
67+
faber -v
68+
sed -e "s/\$PYTHON/python/g" .ci/faber > ~/.faber
69+
faber \
70+
--with-boost-include=${BOOST_PY_DEPS} \
71+
--builddir=build \
72+
cxx.name=${{ matrix.cxx }} \
73+
cxxflags=-std=${{ matrix.std }} \
74+
cppflags=-std=${{ matrix.std }} \
75+
-j`nproc`
76+
- name: build-py3
77+
if: "${{ matrix.python-version != '2.7' }}"
4578
run: |
4679
.github/run-faber.sh
47-
- name: test
80+
- name: test-py2
81+
if: "${{ matrix.python-version == '2.7' }}"
82+
run: |
83+
faber \
84+
--with-boost-include=${BOOST_PY_DEPS} \
85+
--builddir=build \
86+
cxx.name=${{ matrix.cxx }} \
87+
cxxflags=-std=${{ matrix.std }} \
88+
cppflags=-std=${{ matrix.std }} \
89+
-j`nproc` \
90+
test.report
91+
- name: test-py3
92+
if: "${{ matrix.python-version != '2.7' }}"
4893
run: |
4994
.github/run-faber.sh test.report

0 commit comments

Comments
 (0)