Skip to content

Commit 63b2831

Browse files
committed
Pick the runner per Python version in the matrix
1 parent 6186394 commit 63b2831

2 files changed

Lines changed: 18 additions & 7 deletions

File tree

‎.github/workflows/benchmark.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ permissions:
77

88
jobs:
99
benchmark_sql_algorithm:
10-
# actions/setup-python has no Python 3.9 for Ubuntu 26.04
1110
runs-on: ubuntu-24.04
1211
timeout-minutes: 10
1312
steps:
@@ -42,13 +41,16 @@ jobs:
4241
poetry run python ./benchmarks/sql_benchmark/sql_benchmark_no_fw.py
4342
4443
benchmark_with_flask_mysql:
45-
# actions/setup-python has no Python 3.9 for Ubuntu 26.04
46-
runs-on: ${{ matrix.python-version == '3.9' && 'ubuntu-24.04' || 'ubuntu-latest' }}
44+
runs-on: ${{ matrix.os }}
4745
timeout-minutes: 10
4846
strategy:
4947
fail-fast: false
5048
matrix:
5149
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
50+
include:
51+
- os: ubuntu-latest
52+
- python-version: "3.9"
53+
os: ubuntu-24.04
5254
steps:
5355
- name: Checkout code
5456
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -92,8 +94,7 @@ jobs:
9294
k6 run -q ./benchmarks/flask-mysql-benchmarks.js
9395
9496
wrk_benchmarks:
95-
# actions/setup-python has no Python 3.9 for Ubuntu 26.04
96-
runs-on: ${{ matrix.python-version == '3.9' && 'ubuntu-24.04' || 'ubuntu-latest' }}
97+
runs-on: ${{ matrix.os }}
9798
timeout-minutes: 10
9899
strategy:
99100
fail-fast: false
@@ -103,6 +104,10 @@ jobs:
103104
exclude:
104105
- app: flask-mysql-uwsgi
105106
python-version: "3.14"
107+
include:
108+
- os: ubuntu-latest
109+
- python-version: "3.9"
110+
os: ubuntu-24.04
106111
steps:
107112
- name: Checkout code
108113
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

‎.github/workflows/unit-test.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,21 @@ permissions:
55

66
jobs:
77
test:
8-
# actions/setup-python has no Python 3.8 or 3.9 for Ubuntu 26.04
9-
runs-on: ${{ (matrix.python-version == '3.8' || matrix.python-version == '3.9') && 'ubuntu-24.04' || 'ubuntu-latest' }}
8+
runs-on: ${{ matrix.os }}
109
continue-on-error: true
1110
timeout-minutes: 15
1211
strategy:
1312
# Don't cancel jobs if one fails
1413
fail-fast: false
1514
matrix:
1615
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
16+
include:
17+
- os: ubuntu-latest
18+
# actions/setup-python has no Python 3.8 or 3.9 for Ubuntu 26.04
19+
- python-version: "3.8"
20+
os: ubuntu-24.04
21+
- python-version: "3.9"
22+
os: ubuntu-24.04
1723
steps:
1824
- name: Checkout code
1925
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

0 commit comments

Comments
 (0)