File tree Expand file tree Collapse file tree 2 files changed +12
-12
lines changed
Expand file tree Collapse file tree 2 files changed +12
-12
lines changed Original file line number Diff line number Diff line change @@ -43,14 +43,14 @@ RUN <<EOF
4343 apt install -y "${pkgs[@]}"
4444EOF
4545
46- # Install Conan.
46+ # Install Conan && gcovr
4747ARG CONAN_VERSION=2.17.0
4848ARG GCOVR_VERSION=8.2
49- RUN PIPX_HOME=/opt/pipx \
50- PIPX_BIN_DIR=/usr/bin \
51- PIPX_MAN_DIR=/usr/share/man \
52- pipx install conan==${CONAN_VERSION} && \
53- pipx install gcovr
49+ ENV PIPX_HOME=/opt/pipx \
50+ PIPX_BIN_DIR=/usr/local/ bin \
51+ PIPX_MAN_DIR=/usr/share/man
52+ RUN pipx install conan==${CONAN_VERSION} && \
53+ pipx install gcovr==${GCOVR_VERSION}
5454
5555# Create the user to switch to, once all packages have been installed.
5656ARG NONROOT_USER=ci
Original file line number Diff line number Diff line change @@ -34,14 +34,14 @@ RUN <<EOF
3434 apt install -y "${pkgs[@]}"
3535EOF
3636
37- # Install Conan.
37+ # Install Conan && gcovr
3838ARG CONAN_VERSION=2.17.0
3939ARG GCOVR_VERSION=8.2
40- RUN PIPX_HOME=/opt/pipx \
41- PIPX_BIN_DIR=/usr/bin \
42- PIPX_MAN_DIR=/usr/share/man \
43- pipx install conan==${CONAN_VERSION} && \
44- pipx install gcovr
40+ ENV PIPX_HOME=/opt/pipx \
41+ PIPX_BIN_DIR=/usr/local/ bin \
42+ PIPX_MAN_DIR=/usr/share/man
43+ RUN pipx install conan==${CONAN_VERSION} && \
44+ pipx install gcovr==${GCOVR_VERSION}
4545
4646# Create the user to switch to, once all packages have been installed.
4747ARG NONROOT_USER=ci
You can’t perform that action at this time.
0 commit comments