Skip to content

Commit d0d9749

Browse files
authored
This fixes the CPACK workflow failures for Ubuntu and RHEL (#368)
* Add texinfo to Ubuntu and RHEL docker files * Add the `bison` package to Ubuntu dockerfile * Update the CI docker files too. --------- Signed-off-by: David Galiffi <[email protected]>
1 parent c11abc4 commit d0d9749

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

docker/Dockerfile.rhel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ ENV PATH /usr/local/bin:${PATH}
1414
ENV LIBRARY_PATH ${LIBRARY_PATH}:/opt/amdgpu/lib64
1515

1616
RUN yum groupinstall -y "Development Tools" && \
17-
yum install -y epel-release && \
18-
yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip wget zlib-devel which && \
17+
yum install -y epel-release && crb enable && \
18+
yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel && \
1919
yum clean all && \
2020
python3 -m pip install 'cmake==3.21.4'
2121

docker/Dockerfile.rhel.ci

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ARG ELFUTILS_DOWNLOAD_VERSION="0.186"
1717
ARG NJOBS="12"
1818

1919
RUN yum groupinstall -y "Development Tools" && \
20-
yum install -y epel-release && \
21-
yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip wget zlib-devel which && \
20+
yum install -y epel-release && crb enable && \
21+
yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel && \
2222
yum clean all && \
2323
python3 -m pip install 'cmake==3.21.4'
2424

docker/Dockerfile.ubuntu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ENV PATH ${HOME}/.local/bin:${PATH}
2323

2424
RUN apt-get update && \
2525
apt-get dist-upgrade -y && \
26-
apt-get install -y build-essential cmake libnuma1 wget gnupg2 m4 bash-completion git-core autoconf libtool autotools-dev python3-pip lsb-release libpapi-dev libpfm4-dev libudev1 libopenmpi-dev rpm librpm-dev curl apt-utils && \
26+
apt-get install -y apt-utils autoconf autotools-dev bash-completion bison build-essential cmake curl git-core gnupg2 libnuma1 libopenmpi-dev libpapi-dev libpfm4-dev librpm-dev libtool libudev1 lsb-release m4 python3-pip rpm texinfo wget && \
2727
python3 -m pip install 'cmake==3.21.4'
2828

2929
RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \

docker/Dockerfile.ubuntu.ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ COPY ./dyninst-source /tmp/dyninst
2727

2828
RUN apt-get update && \
2929
apt-get dist-upgrade -y && \
30-
apt-get install -y autoconf autotools-dev bash-completion build-essential bzip2 cmake curl environment-modules git-core gnupg2 gzip libiberty-dev libpapi-dev libpfm4-dev libtool locales lsb-release m4 python3-pip unzip wget zip zlib1g-dev && \
30+
apt-get install -y autoconf autotools-dev bash-completion bison build-essential bzip2 cmake curl environment-modules git-core gnupg2 gzip libiberty-dev libpapi-dev libpfm4-dev libtool locales lsb-release m4 python3-pip texinfo unzip wget zip zlib1g-dev && \
3131
python3 -m pip install 'cmake==3.18.4' && \
3232
apt-get autoclean && \
3333
locale -a && \

0 commit comments

Comments
 (0)