From 87a40437f8dadab36f95e7afb0811f66694a0d36 Mon Sep 17 00:00:00 2001 From: Romulo Quidute Filho <116586593+rquidute@users.noreply.github.com> Date: Tue, 17 Dec 2024 10:55:29 -0300 Subject: [PATCH] Merge V2.11+fall2024 into main (#174) * Updated SDK SHA - revert * Changed SDK_DOCKER_TAG to f2e5de7_latest * Make all TH dependencies not static (#164) * Updated package-dependency-list.txt * Updated missing dependencies --- test_collections/matter/config.py | 2 +- .../scripts/package-dependency-list.txt | 30 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test_collections/matter/config.py b/test_collections/matter/config.py index e8b28fcd..00a24c29 100644 --- a/test_collections/matter/config.py +++ b/test_collections/matter/config.py @@ -23,7 +23,7 @@ class MatterSettings(BaseSettings): # SDK Docker Image SDK_DOCKER_IMAGE: str = "connectedhomeip/chip-cert-bins" - SDK_DOCKER_TAG: str = "f2e5de7e7978dd0748ba014f7b6ce593dad2fc88" + SDK_DOCKER_TAG: str = "f2e5de7_latest" # SDK SHA: used to fetch test YAML from SDK. SDK_SHA: str = "f2e5de7e7978dd0748ba014f7b6ce593dad2fc88" diff --git a/test_collections/matter/scripts/package-dependency-list.txt b/test_collections/matter/scripts/package-dependency-list.txt index dccf9c5d..67cbf0c7 100644 --- a/test_collections/matter/scripts/package-dependency-list.txt +++ b/test_collections/matter/scripts/package-dependency-list.txt @@ -1,20 +1,20 @@ apt-transport-https (>=2.7.14build2) avahi-utils (>=0.8-13ubuntu6) -ca-certificates (=20240203) -figlet (=2.2.5-3) -g++ (=4:13.2.0-7ubuntu1) -gcc (=4:13.2.0-7ubuntu1) -generate-ninja (=0.0~git20240221.03d10f1-1) -libavahi-client-dev (=0.8-13ubuntu6) -libcairo2-dev (=1.18.0-3build1) +ca-certificates (>=20240203) +figlet (>=2.2.5-3) +g++ (>=4:13.2.0-7ubuntu1) +gcc (>=4:13.2.0-7ubuntu1) +generate-ninja (>=0.0~git20240221.03d10f1-1) +libavahi-client-dev (>=0.8-13ubuntu6) +libcairo2-dev (>=1.18.0-3build1) libdbus-1-dev (>=1.14.10-4ubuntu4.1) -libgirepository1.0-dev (=1.80.1-1) +libgirepository1.0-dev (>=1.80.1-1) libglib2.0-dev (>=2.80.0-6ubuntu3.1) -libreadline-dev (=8.2-4build1) +libreadline-dev (>=8.2-4build1) libssl-dev (>=3.0.13-0ubuntu3.1) -net-tools (=2.10-0.1ubuntu4) -ninja-build (=1.11.1-2) -npm (=9.2.0~ds1-2) -pkg-config (=1.8.1-2build1) -software-properties-common (=0.99.48) -toilet (=0.3-1.4build1) \ No newline at end of file +net-tools (>=2.10-0.1ubuntu4) +ninja-build (>=1.11.1-2) +npm (>=9.2.0~ds1-2) +pkg-config (>=1.8.1-2build1) +software-properties-common (>=0.99.48) +toilet (>=0.3-1.4build1) \ No newline at end of file