Skip to content

Commit bb960b6

Browse files
committed
Merge branch 'ci/fix-cmake-versions' into 'main'
ci: fix cmake versions See merge request espressif/idf-component-manager!535
2 parents bbefbbe + 4c8fe2a commit bb960b6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

ci/build_docker.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ build:
1010
parallel:
1111
matrix:
1212
- IDF_BRANCH_TAG: [release-v5.0, release-v5.1]
13-
PYTHON_IMAGE_TAG: [3.7-bullseye, 3.13-bookworm]
13+
PYTHON_IMAGE_TAG: ["3.7", "3.13"]
1414
- IDF_BRANCH_TAG: [release-v5.2, release-v5.3, release-v5.4]
15-
PYTHON_IMAGE_TAG: [3.8-bullseye, 3.13-bookworm]
15+
PYTHON_IMAGE_TAG: ["3.8", "3.13"]
1616
- IDF_BRANCH_TAG: [release-v5.5]
17-
PYTHON_IMAGE_TAG: [3.9-bullseye, 3.13-bookworm]
17+
PYTHON_IMAGE_TAG: ["3.9", "3.13"]
1818
- IDF_BRANCH_TAG: [master]
19-
PYTHON_IMAGE_TAG: [3.10-bullseye, 3.13-bookworm]
19+
PYTHON_IMAGE_TAG: ["3.10", "3.13"]
2020
script:
2121
- BRANCH_NAME=$(echo $IDF_BRANCH_TAG | sed -e "s/release-v/release\/v/g")
2222
- |

ci/integration_tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ integration_test:
1919
matrix:
2020
# PYTEST_SPLIT_TEST_GROUP: Split integration tests into parallel jobs. The number of groups has to be reflected in the pytest invocation
2121
- IDF_BRANCH_TAG: [release-v5.0, release-v5.1]
22-
PYTHON_IMAGE_TAG: [3.7-bullseye, 3.13-bookworm]
22+
PYTHON_IMAGE_TAG: ["3.7", "3.13"]
2323
PYTEST_SPLIT_TEST_GROUP: [1, 2, 3, 4, 5]
2424
- IDF_BRANCH_TAG: [release-v5.2, release-v5.3, release-v5.4]
25-
PYTHON_IMAGE_TAG: [3.8-bullseye, 3.13-bookworm]
25+
PYTHON_IMAGE_TAG: ["3.8", "3.13"]
2626
PYTEST_SPLIT_TEST_GROUP: [1, 2, 3, 4, 5]
2727
- IDF_BRANCH_TAG: [release-v5.5]
28-
PYTHON_IMAGE_TAG: [3.9-bullseye, 3.13-bookworm]
28+
PYTHON_IMAGE_TAG: ["3.9", "3.13"]
2929
PYTEST_SPLIT_TEST_GROUP: [1, 2, 3, 4, 5]
3030
- IDF_BRANCH_TAG: [master]
31-
PYTHON_IMAGE_TAG: [3.10-bullseye, 3.13-bookworm]
31+
PYTHON_IMAGE_TAG: ["3.10", "3.13"]
3232
PYTEST_SPLIT_TEST_GROUP: [1, 2, 3, 4, 5]
3333
before_script:
3434
- IMAGE_TAG="${DOCKER_IMAGE}:${PYTHON_IMAGE_TAG}-${IDF_BRANCH_TAG}"

0 commit comments

Comments
 (0)