mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: fix CMake installation for 32 and 64bit dist Linux

Browse Source
This commit is contained in:
Jakub Beránek 2023-07-25 13:32:44 +02:00
parent ff8fe76c0e
commit 6c4437e3d2
No known key found for this signature in database
GPG Key ID: 909CD0D26483516B
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile
View File

@ -12,7 +12,6 @@ RUN yum upgrade -y && \
automake \ automake \
bzip2 \ bzip2 \
file \ file \
cmake3 \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
git \ git \
@ -35,7 +34,7 @@ RUN yum upgrade -y && \
zlib-devel.x86_64 \ zlib-devel.x86_64 \
&& yum clean all && 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 PATH=/rustroot/bin:$PATH
ENV LD_LIBRARY_PATH=/rustroot/lib64:/rustroot/lib32:/rustroot/lib ENV LD_LIBRARY_PATH=/rustroot/lib64:/rustroot/lib32:/rustroot/lib

3
src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
View File

@ -12,7 +12,6 @@ RUN yum upgrade -y && \
automake \ automake \
bzip2 \ bzip2 \
file \ file \
cmake3 \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
git \ git \
@ -35,7 +34,7 @@ RUN yum upgrade -y && \
zlib-devel.x86_64 \ zlib-devel.x86_64 \
&& yum clean all && 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 PATH=/rustroot/bin:$PATH
ENV LD_LIBRARY_PATH=/rustroot/lib64:/rustroot/lib32:/rustroot/lib ENV LD_LIBRARY_PATH=/rustroot/lib64:/rustroot/lib32:/rustroot/lib