Skip to content

Commit 70a51f5

Browse files
committed
Revert "ci: when testing, install python 3.12, required by zephyr now"
This reverts commit e22db85 because the Zephyr change increasing the minimum required Python version from 3.10 to 3.12 was reverted. Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
1 parent d28673e commit 70a51f5

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -343,19 +343,19 @@ jobs:
343343
344344
if [ "${build_host_linux_x86_64}" == "y" ]; then
345345
MATRIX_TESTENVS+='{
346-
"name": "ubuntu-24.04-x86_64",
346+
"name": "ubuntu-20.04-x86_64",
347347
"runner": "zephyr-runner-v2-linux-x64-4xlarge",
348-
"container": "ghcr.io/zephyrproject-rtos/ci:main",
348+
"container": "ghcr.io/zephyrproject-rtos/ci:master",
349349
"bundle-host": "linux-x86_64",
350350
"bundle-archive": "tar.xz"
351351
},'
352352
fi
353353
354354
if [ "${build_host_linux_aarch64}" == "y" ]; then
355355
MATRIX_TESTENVS+='{
356-
"name": "ubuntu-24.04-aarch64",
356+
"name": "ubuntu-20.04-aarch64",
357357
"runner": "zephyr-runner-v2-linux-arm64-4xlarge",
358-
"container": "ghcr.io/zephyrproject-rtos/ci:main",
358+
"container": "ghcr.io/zephyrproject-rtos/ci:master",
359359
"bundle-host": "linux-aarch64",
360360
"bundle-archive": "tar.xz"
361361
},'
@@ -1310,11 +1310,12 @@ jobs:
13101310

13111311
steps:
13121312
- name: Set up Python
1313+
if: ${{ runner.os == 'Windows' }}
13131314
uses: actions/setup-python@v5
13141315
with:
1315-
# Force Python 3.12, which is the minimum Python version supported by
1316-
# Zephyr and intended to be used with Zephyr SDK.
1317-
python-version: '3.12'
1316+
# Force Python 3.10 because the twister is not compatible with a Python
1317+
# version lower than 3.8 on Windows.
1318+
python-version: '3.10'
13181319

13191320
- name: Set up test environment (Linux)
13201321
if: ${{ runner.os == 'Linux' }}
@@ -1510,8 +1511,6 @@ jobs:
15101511
# if running inside a virtual environment; otherwise, it is assumed
15111512
# that the host already provides all the required dependencies.
15121513
pip3 install -r ${ZEPHYR_ROOT}/scripts/requirements.txt
1513-
else
1514-
pip3 install -r ${ZEPHYR_ROOT}/scripts/requirements-actions.txt --require-hashes
15151514
fi
15161515
15171516
- name: Run test suites

0 commit comments

Comments
 (0)