Skip to content

CI: fix CMake installation for 32/64 bit dist Linux #114053

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

Merged
merged 1 commit into from
Jul 27, 2023
Merged

CI: fix CMake installation for 32/64 bit dist Linux #114053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ RUN yum upgrade -y && \
automake \
bzip2 \
file \
cmake3 \
gcc \
gcc-c++ \
git \
Expand All @@ -35,7 +34,7 @@ RUN yum upgrade -y && \
zlib-devel.x86_64 \
&& yum clean all

RUN mkdir -p /rustroot/bin && ln -s /usr/bin/cmake3 /rustroot/bin/cmake
RUN mkdir -p /rustroot/bin

ENV PATH=/rustroot/bin:$PATH
ENV LD_LIBRARY_PATH=/rustroot/lib64:/rustroot/lib32:/rustroot/lib
Expand Down
3 changes: 1 addition & 2 deletions src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ RUN yum upgrade -y && \
automake \
bzip2 \
file \
cmake3 \
gcc \
gcc-c++ \
git \
Expand All @@ -35,7 +34,7 @@ RUN yum upgrade -y && \
zlib-devel.x86_64 \
&& yum clean all

RUN mkdir -p /rustroot/bin && ln -s /usr/bin/cmake3 /rustroot/bin/cmake
RUN mkdir -p /rustroot/bin

ENV PATH=/rustroot/bin:$PATH
ENV LD_LIBRARY_PATH=/rustroot/lib64:/rustroot/lib32:/rustroot/lib
Expand Down