Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redo unintentionally undone chip-cert-bins changes #34481

Merged
merged 5 commits into from
Aug 8, 2024
Merged

Redo unintentionally undone chip-cert-bins changes #34481

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86b73f5
Add data model XML files to chip-cert-bins
ccruzagralopes Jul 24, 2024
ef3b830
Add RVC app to chip-cert-bins image
ccruzagralopes Jul 24, 2024
ad5399c
Merge branch 'master' into redo-unintentionally-undone-chip-cert-bins…
ccruzagralopes Jul 25, 2024
d279c3c
Merge branch 'master' into redo-unintentionally-undone-chip-cert-bins…
andy31415 Jul 29, 2024
4a35723
Merge branch 'master' into redo-unintentionally-undone-chip-cert-bins…
ccruzagralopes Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion integrations/docker/images/chip-cert-bins/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ RUN case ${TARGETPLATFORM} in \
--target linux-x64-lit-icd-ipv6only \
--target linux-x64-energy-management-ipv6only \
--target linux-x64-microwave-oven-ipv6only \
--target linux-x64-rvc-ipv6only \
build \
&& mv out/linux-x64-chip-tool-ipv6only-platform-mdns/chip-tool out/chip-tool \
&& mv out/linux-x64-shell-ipv6only-platform-mdns/chip-shell out/chip-shell \
Expand All @@ -211,6 +212,7 @@ RUN case ${TARGETPLATFORM} in \
&& mv out/linux-x64-lit-icd-ipv6only/lit-icd-app out/lit-icd-app \
&& mv out/linux-x64-energy-management-ipv6only/chip-energy-management-app out/chip-energy-management-app \
&& mv out/linux-x64-microwave-oven-ipv6only/chip-microwave-oven-app out/chip-microwave-oven-app \
&& mv out/linux-x64-rvc-ipv6only/chip-rvc-app out/chip-rvc-app \
;; \
"linux/arm64")\
set -x \
Expand All @@ -234,6 +236,7 @@ RUN case ${TARGETPLATFORM} in \
--target linux-arm64-lit-icd-ipv6only \
--target linux-arm64-energy-management-ipv6only \
--target linux-arm64-microwave-oven-ipv6only \
--target linux-arm64-rvc-ipv6only \
build \
&& mv out/linux-arm64-chip-tool-ipv6only-platform-mdns/chip-tool out/chip-tool \
&& mv out/linux-arm64-shell-ipv6only-platform-mdns/chip-shell out/chip-shell \
Expand All @@ -253,6 +256,7 @@ RUN case ${TARGETPLATFORM} in \
&& mv out/linux-arm64-lit-icd-ipv6only/lit-icd-app out/lit-icd-app \
&& mv out/linux-arm64-energy-management-ipv6only/chip-energy-management-app out/chip-energy-management-app \
&& mv out/linux-arm64-microwave-oven-ipv6only/chip-microwave-oven-app out/chip-microwave-oven-app \
&& mv out/linux-arm64-rvc-ipv6only/chip-rvc-app out/chip-rvc-app \
;; \
*) ;; \
esac
Expand Down Expand Up @@ -285,11 +289,13 @@ COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-app1 chip-app1
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/lit-icd-app lit-icd-app
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-energy-management-app chip-energy-management-app
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-microwave-oven-app chip-microwave-oven-app
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-rvc-app chip-rvc-app

# Stage 3.1: Setup the Matter Python environment
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/python_lib python_lib
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/python_env python_env
COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing python_testing
COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing python_testing/scripts/sdk
COPY --from=chip-build-cert-bins /root/connectedhomeip/data_model python_testing/data_model

COPY --from=chip-build-cert-bins /root/connectedhomeip/scripts/tests/requirements.txt /tmp/requirements.txt
RUN pip install --break-system-packages -r /tmp/requirements.txt && rm /tmp/requirements.txt
Expand Down
Loading