Skip to content
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

update dockerfile installed cmake version to 3.27 #1763

Merged
merged 1 commit into from
Nov 8, 2024
Merged

update dockerfile installed cmake version to 3.27 #1763

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
2 changes: 1 addition & 1 deletion docker-build-v2/amd64-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN git clone --depth 1 --branch v1.5.6 https://github.com/facebook/zstd.git \

RUN pip3 install --upgrade pip \
&& pip3 install scikit-build \
&& pip3 install cmake==3.25.*
&& pip3 install cmake==3.27.*

WORKDIR /build
RUN mkdir src cache out artifacts && chmod a+rwx cache out artifacts
Expand Down
2 changes: 1 addition & 1 deletion docker-build-v2/amd64-windows/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*

# Using `pipx --global` would be better but it's available only since pipx 1.5
RUN PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install cmake==3.25.*
RUN PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install cmake==3.27.*

WORKDIR /build
RUN mkdir src cache out artifacts && chmod a+rwx cache out artifacts
Expand Down
4 changes: 2 additions & 2 deletions docker-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN apt-get update;apt-get install -y \
sed \
unzip \
wget \
xz-utils
xz-utils

# Install MXE and build cross-compile windows gcc
RUN cd /; \
Expand All @@ -49,7 +49,7 @@ RUN cd /; \
# Main Image
FROM ubuntu:18.04

ARG cmake_version=3.25.*
ARG cmake_version=3.27.*
ARG ccache_version="v4.5.1"

COPY --from=mxe /mxe /mxe
Expand Down