Skip to content

Commit 10dd664

Browse files
committed
disable
1 parent 42fccd5 commit 10dd664

File tree

5 files changed

+15
-40
lines changed

5 files changed

+15
-40
lines changed

docker/Dockerfile

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM ghcr.io/project-chip/chip-build:latest AS build
22
LABEL org.opencontainers.image.source=https://github.com/project-chip/connectedhomeip
33

44

5-
# Copy SLT package manifests and Simplicity SDK keep-list (build context must be repo root)
6-
COPY scripts/setup/silabs/sisdk-pkg.slt scripts/setup/silabs/wiseconnect-pkg.slt docker/requirements.txt /tmp/
5+
# Copy SLT package manifests, lock (conan-repos without conan-aus for CI reachability), and Simplicity SDK keep-list (build context must be repo root)
6+
COPY scripts/setup/silabs/sisdk-pkg.lock scripts/setup/silabs/wiseconnect-pkg.slt docker/requirements.txt /tmp/
77
COPY scripts/setup/silabs/simplicity_sdk_keep_folders.txt /tmp/keep_folders.txt
88

99
# GNU ARM Embedded toolchain, cross compiler for various platform builds
@@ -32,21 +32,8 @@ RUN set -x \
3232

3333
RUN set -x \
3434
&& /tmp/slt_install/slt update --self \
35-
&& echo "Installing conan via SLT..." \
36-
&& rm -rf /root/.silabs/slt/installs/conan/ \
37-
&& rm -rf /root/.silabs/slt/engines/ \
38-
&& rm -rf /root/.silabs/slt/installs/conan/slt-remotes.json \
39-
&& /tmp/slt_install/slt install conan \
40-
&& echo "Locating conan and adding pre-release remote..." \
4135
&& conan_path=$(/tmp/slt_install/slt where conan)/conan/conan \
42-
&& $conan_path remote add testing https://conan-prerelease.silabs.net/ \
43-
&& echo "Conan pre-release remote added." \
44-
&& rm -rf /root/.silabs/slt/installs/conan/slt-remotes.json \
45-
&& $conan_path remote list \
46-
&& /tmp/slt_install/slt install simplicity-sdk \
47-
&& ($conan_path remote list | grep -q conan-silabs-net && $conan_path remote disable conan-silabs-net || true) \
48-
&& $conan_path list "*" -r testing \
49-
&& /tmp/slt_install/slt install simplicity-sdk/2025.12.1-alpha \
36+
&& /tmp/slt_install/slt install -f /tmp/sisdk-pkg.lock \
5037
&& cp -a $(/tmp/slt_install/slt where simplicity-sdk) /tmp/simplicity_sdk \
5138
&& : # last line
5239

scripts/setup/silabs/sdk-pkg.lock

Lines changed: 0 additions & 15 deletions
This file was deleted.

scripts/setup/silabs/sdk-pkg.slt

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version = "0"
2+
3+
[dependency]
4+
simplicity-sdk = [{ installer = "conan", ref = "simplicity-sdk/2025.12.1-alpha@silabs#9f22e7efe2ff3fe28eabf4c78d205883", type = "sdk", version = "2025.12.1-alpha" }]
5+
6+
[engine]
7+
conan-repos = [
8+
"https://conan.silabs.net",
9+
"https://conan-prerelease.silabs.net/",
10+
"https://conan-aus.silabs.net",
11+
]

scripts/setup/silabs/sisdk-pkg.slt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ version = "0"
44

55
[dependency]
66
# Get a specific version of the package
7-
simplicity-sdk = { version = "2025.12.1-alpha", installer ="conan", prerelease=true }
7+
simplicity-sdk = { version = "2025.12.1-alpha@silabs", installer ="conan", prerelease=true }

0 commit comments

Comments
 (0)