Skip to content

Commit a40483c

Browse files
committed
ci(release): Install cmake in container
1 parent c985c77 commit a40483c

2 files changed

Lines changed: 12 additions & 7 deletions

File tree

.github/scripts/gen_dockerfile.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,27 @@ if [ $(echo $full_tgtname | cut -d ':' -f 1) = "centos" ]; then
2626

2727
echo "RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*" >> $filename
2828
echo "RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*" >> $filename
29-
echo 'RUN yum group install "Development Tools" -y && yum clean all' >> $filename
29+
echo 'RUN yum group install "Development Tools" -y && (yum install -y cmake3 || yum install -y cmake) && yum clean all' >> $filename
30+
echo 'RUN [ -x /usr/bin/cmake ] || ln -s /usr/bin/cmake3 /usr/bin/cmake' >> $filename
3031
fi
3132
if [ $(echo $full_tgtname | cut -d ':' -f 1) = "ubuntu" ]; then
32-
echo 'RUN apt update && apt -y install build-essential curl' >> $filename
33+
echo 'RUN apt update && apt -y install build-essential curl cmake' >> $filename
3334
fi
3435
if [ $(echo $full_tgtname | cut -d ':' -f 1) = "fedora" ]; then
35-
echo 'RUN dnf -y update && dnf -y install @development-tools' >> $filename
36+
echo 'RUN dnf -y update && dnf -y install @development-tools cmake' >> $filename
3637
fi
3738
if [ $(echo $full_tgtname | cut -d ':' -f 1) = "debian" ]; then
38-
echo 'RUN apt update && apt -y install build-essential curl gcc make' >> $filename
39+
echo 'RUN apt update && apt -y install build-essential curl gcc make cmake' >> $filename
3940
fi
4041
if [ $(echo $full_tgtname | cut -d ':' -f 1) = "almalinux" ]; then
4142
if [ $(echo $full_tgtname | cut -d ':' -f 2 | cut -d '.' -f 1) = '8' ]; then
4243
echo 'RUN rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux' >> $filename
4344
fi
44-
echo 'RUN dnf -y update && dnf -y group install "Development Tools"' >> $filename
45+
echo 'RUN dnf -y update && dnf -y group install "Development Tools" && (dnf -y install cmake || dnf -y install cmake3)' >> $filename
46+
echo 'RUN [ -x /usr/bin/cmake ] || ln -s /usr/bin/cmake3 /usr/bin/cmake' >> $filename
4547
fi
4648
if [[ $(echo $full_tgtname | cut -d ':' -f 1) == "redhat"* ]]; then
47-
echo 'RUN dnf -y install gcc' >> $filename
49+
echo 'RUN dnf -y install gcc cmake' >> $filename
4850
fi
4951
echo >> $filename
5052
echo 'ENV RUSTUP_HOME=/usr/local/rustup CARGO_HOME=/usr/local/cargo' >> $filename
@@ -55,4 +57,3 @@ echo ' curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stabl
5557
echo ' chmod -R a=rwX $CARGO_HOME' >> $filename
5658
echo >> $filename
5759
echo 'WORKDIR /source' >> $filename
58-

.github/workflows/release.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ jobs:
167167
echo "RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*" >> Dockerfile
168168
echo "RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*" >> Dockerfile
169169
echo "RUN yum group install "Development Tools" -y && yum clean all" >> Dockerfile
170+
echo "RUN (yum install -y cmake3 || yum install -y cmake) && yum clean all" >> Dockerfile
171+
echo "RUN [ -x /usr/bin/cmake ] || ln -s /usr/bin/cmake3 /usr/bin/cmake" >> Dockerfile
170172
echo 'ENV RUSTUP_HOME=/usr/local/rustup CARGO_HOME=/usr/local/cargo' >> Dockerfile
171173
echo 'ENV PATH=$CARGO_HOME/bin:$PATH' >> Dockerfile
172174
echo >> Dockerfile
@@ -215,6 +217,8 @@ jobs:
215217
echo "RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*" >> Dockerfile
216218
echo "RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*" >> Dockerfile
217219
echo "RUN yum group install "Development Tools" -y && yum clean all" >> Dockerfile
220+
echo "RUN (yum install -y cmake3 || yum install -y cmake) && yum clean all" >> Dockerfile
221+
echo "RUN [ -x /usr/bin/cmake ] || ln -s /usr/bin/cmake3 /usr/bin/cmake" >> Dockerfile
218222
echo 'ENV RUSTUP_HOME=/usr/local/rustup CARGO_HOME=/usr/local/cargo' >> Dockerfile
219223
echo 'ENV PATH=$CARGO_HOME/bin:$PATH' >> Dockerfile
220224
echo >> Dockerfile

0 commit comments

Comments
 (0)