@@ -40,11 +40,13 @@ RUN set -x \
40
40
clang \
41
41
clang-format \
42
42
clang-tidy \
43
+ cmake \
43
44
curl \
44
45
flex \
45
- gcc \
46
46
g++ \
47
+ gcc \
47
48
git \
49
+ git-lfs \
48
50
gperf \
49
51
iproute2 \
50
52
jq \
@@ -54,11 +56,12 @@ RUN set -x \
54
56
libcairo2-dev \
55
57
libdbus-1-dev \
56
58
libdbus-glib-1-dev \
59
+ libdmalloc-dev \
57
60
libgif-dev \
61
+ libgirepository1.0-dev \
58
62
libglib2.0-dev \
59
63
libical-dev \
60
64
libjpeg-dev \
61
- libdmalloc-dev \
62
65
libmbedtls-dev \
63
66
libncurses5-dev \
64
67
libncursesw5-dev \
@@ -79,55 +82,23 @@ RUN set -x \
79
82
pkg-config \
80
83
python3 \
81
84
python3-dev \
85
+ python3-pip \
82
86
python3-venv \
83
87
rsync \
84
88
shellcheck \
89
+ software-properties-common \
85
90
strace \
86
91
systemd \
87
92
udev \
88
93
unzip \
89
94
wget \
90
- git-lfs \
91
95
zlib1g-dev \
92
96
&& git lfs install \
93
97
&& : # last line
94
98
95
- # Cmake (Mbed OS requires >=3.19.0-rc3 version which is not available in Ubuntu 20.04 repository)
96
- RUN case ${TARGETPLATFORM} in \
97
- "linux/amd64" ) \
98
- set -x \
99
- && (cd /tmp \
100
- && wget --progress=dot:giga https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3-Linux-x86_64.sh \
101
- && sh cmake-3.19.3-Linux-x86_64.sh --exclude-subdir --prefix=/usr/local \
102
- && rm -rf cmake-3.19.3-Linux-x86_64.sh) \
103
- && exec bash \
104
- ;; \
105
- "linux/arm64" ) \
106
- set -x \
107
- && (cd /tmp \
108
- && wget --progress=dot:giga https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3-Linux-aarch64.sh \
109
- && sh cmake-3.19.3-Linux-aarch64.sh --exclude-subdir --prefix=/usr/local \
110
- && rm -rf cmake-3.19.3-Linux-aarch64.sh) \
111
- && exec bash \
112
- ;; \
113
- *) \
114
- test -n "$TARGETPLATFORM" \
115
- echo "Unsupported platform ${TARGETPLATFORM}" \
116
- ;; \
117
- esac
118
-
119
- # Python 3 and PIP
120
- RUN set -x \
121
- && DEBIAN_FRONTEND=noninteractive apt-get install -y \
122
- libgirepository1.0-dev \
123
- software-properties-common \
124
- && add-apt-repository universe \
125
- && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
126
- && python3 get-pip.py --break-system-packages \
127
- && : # last line
128
-
129
99
RUN set -x \
130
- && pip3 install attrs coloredlogs PyGithub pygit future portpicker mobly click cxxfilt ghapi pandas tabulate --break-system-packages \
100
+ && pip3 install --break-system-packages \
101
+ attrs coloredlogs PyGithub pygit future portpicker mobly click cxxfilt ghapi pandas tabulate \
131
102
&& : # last line
132
103
133
104
# build and install gn
@@ -327,4 +298,6 @@ RUN pip install --break-system-packages -r /tmp/requirements.txt && rm /tmp/requ
327
298
# PIP requires MASON package compilation, which seems to require a JDK
328
299
RUN set -x && DEBIAN_FRONTEND=noninteractive apt-get update; apt-get install -fy openjdk-8-jdk
329
300
330
- RUN pip install --break-system-packages --no-cache-dir python_lib/controller/python/chip*.whl
301
+ RUN pip install --break-system-packages --no-cache-dir \
302
+ python_lib/python/obj/src/python_testing/matter_testing_infrastructure/chip-testing._build_wheel/chip_testing-*.whl \
303
+ python_lib/controller/python/chip*.whl
0 commit comments