Skip to content

Commit 212c8f3

Browse files
committed
Workflows: Modify the runtest workflow file to pair an OS version with a python version. [skip appveyor]
Changes: * Modify the matrix to pair OS version and PY version. * Update CHANGES.txt and RELEASE.txt accordingly.
1 parent 731991a commit 212c8f3

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

.github/workflows/runtest.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,39 +20,42 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
os: ['ubuntu-22.04', 'ubuntu-24.04']
23+
cfg: [
24+
{os: 'ubuntu-22.04', py: '3.7'},
25+
{os: 'ubuntu-24.04', py: '3.13'},
26+
]
2427

25-
runs-on: ${{ matrix.os }}
28+
runs-on: ${{ matrix.cfg.os }}
2629

2730
steps:
2831
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2932
- uses: actions/checkout@v4
3033

31-
- name: Install Ubuntu packages $${ matrix.os }}
34+
- name: Install Ubuntu packages ${{ matrix.cfg.os }}
3235
run: |
3336
sudo apt-get update
3437
sudo apt-get install libtirpc-dev
3538
36-
- name: Set up Python 3.12 ${{ matrix.os }}
39+
- name: Set up Python ${{ matrix.cfg.py }} ${{ matrix.cfg.os }}
3740
uses: actions/setup-python@v5
3841
with:
39-
python-version: '3.12'
42+
python-version: ${{ matrix.cfg.py }}
4043
cache: 'pip'
4144

42-
- name: Install Python dependencies ${{ matrix.os }}
45+
- name: Install Python ${{ matrix.cfg.py }} dependencies ${{ matrix.cfg.os }}
4346
run: |
4447
python -m pip install --progress-bar off --upgrade pip
4548
python -m pip install --progress-bar off -r requirements-dev.txt
4649
# sudo apt-get update
4750
48-
- name: runtest ${{ matrix.os }}
51+
- name: runtest ${{ matrix.cfg.os }} ${{ matrix.cfg.py }}
4952
run: |
5053
python runtest.py --all --time --jobs=4
5154
52-
- name: Archive Failed tests ${{ matrix.os }}
55+
- name: Archive Failed tests ${{ matrix.cfg.os }} ${{ matrix.cfg.py }}
5356
uses: actions/upload-artifact@v4
5457
if: failure()
5558
with:
56-
name: ${{ matrix.os }}-failed-tests
59+
name: ${{ matrix.cfg.os }}-${{ matrix.cfg.py }}-failed-tests
5760
path: |
5861
failed_tests.log

CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
6666
* Upload the failed_tests.log artifact on failure in select workflow
6767
files. Prior to this change, the failed test log was uploaded only
6868
when none of the tests failed.
69+
* Modify the runtest workflow file to pair an OS version with a python
70+
version.
6971
- Ninja: Increase the number of generated source files in the ninja
7072
iterative speedup test from 200 to 250. Increasing the workload should
7173
reduce the likelihood that the ninja tests are slower.

RELEASE.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,9 @@ DEVELOPMENT
153153
- GitHub: Upload the failed_tests.log artifact on failure in select
154154
workflow files.
155155

156+
- GitHub: Change the runtest workflow to allow the python version to
157+
be specified with the OS version.
158+
156159
- Testing: Increase the default timeout from 20 seconds to 60 seconds
157160
in the testing framework wait_for method. The timeout was increased
158161
during isolated experiments of the interactive tests on windows.

0 commit comments

Comments
 (0)