From 04e13e12b803daa1840ce879cdb1ac395e9c5bfd Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Fri, 11 Apr 2025 17:03:58 +0200 Subject: [PATCH] cmake(ci): fix dotnet build --- cmake/docker/almalinux/dotnet.Dockerfile | 2 +- cmake/docker/alpine/dotnet.Dockerfile | 8 ++++---- cmake/docker/debian/dotnet.Dockerfile | 2 +- cmake/docker/opensuse/dotnet.Dockerfile | 4 ++-- cmake/docker/rockylinux/dotnet.Dockerfile | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake/docker/almalinux/dotnet.Dockerfile b/cmake/docker/almalinux/dotnet.Dockerfile index 3979577eb2..568088c64f 100644 --- a/cmake/docker/almalinux/dotnet.Dockerfile +++ b/cmake/docker/almalinux/dotnet.Dockerfile @@ -5,7 +5,7 @@ FROM ortools/cmake:almalinux_swig AS env RUN wget -q "https://dot.net/v1/dotnet-install.sh" \ && chmod a+x dotnet-install.sh \ && ./dotnet-install.sh -c 3.1 -i /usr/local/bin \ -&& ./dotnet-install.sh -c 6.0 -i /usr/local/bin +&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin # Trigger first run experience by running arbitrary cmd RUN dotnet --info diff --git a/cmake/docker/alpine/dotnet.Dockerfile b/cmake/docker/alpine/dotnet.Dockerfile index ed3fea7d08..ddc72c4801 100644 --- a/cmake/docker/alpine/dotnet.Dockerfile +++ b/cmake/docker/alpine/dotnet.Dockerfile @@ -5,12 +5,12 @@ RUN apk add --no-cache wget icu-libs libintl \ && mkdir -p /usr/share/dotnet \ && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet -## .Net 6.0 -## see: https://dotnet.microsoft.com/download/dotnet-core/6.0 -RUN dotnet_sdk_version=6.0.405 \ +## .Net 8.0 +## see: https://dotnet.microsoft.com/download/dotnet-core/8.0 +RUN dotnet_sdk_version=8.0.408 \ && wget -qO dotnet.tar.gz \ "https://dotnetcli.azureedge.net/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-${dotnet_sdk_version}-linux-musl-x64.tar.gz" \ -&& dotnet_sha512='ca98ebc5858339c5ce4164f5f5932a5bf8aae9f13d54adf382a41f5e6d1302df278bd7e218ecc2f651dcf67e705c40c43347cd33956732c6bd88d3b3d2881b84' \ +&& dotnet_sha512='0ab0c0d52985bde69b594454b5e1d9e1a6e003159656ee2972058d2960cfb0968dbe4d470d8eb21dcea41ff594976520e189a8e13afc44a419ca08e456df36e1' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ && rm dotnet.tar.gz diff --git a/cmake/docker/debian/dotnet.Dockerfile b/cmake/docker/debian/dotnet.Dockerfile index 79b958264d..5cf49e5f8e 100644 --- a/cmake/docker/debian/dotnet.Dockerfile +++ b/cmake/docker/debian/dotnet.Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update -qq \ && dpkg -i packages-microsoft-prod.deb \ && rm packages-microsoft-prod.deb \ && apt-get update -qq \ -&& apt-get install -yq dotnet-sdk-6.0 \ +&& apt-get install -yq dotnet-sdk-8.0 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Trigger first run experience by running arbitrary cmd diff --git a/cmake/docker/opensuse/dotnet.Dockerfile b/cmake/docker/opensuse/dotnet.Dockerfile index af94e5d3ea..6b9970ce39 100644 --- a/cmake/docker/opensuse/dotnet.Dockerfile +++ b/cmake/docker/opensuse/dotnet.Dockerfile @@ -5,11 +5,11 @@ FROM ortools/cmake:opensuse_swig AS env RUN zypper refresh \ && zypper install -y wget tar awk gzip libicu-devel -## .Net 6.0 +## .Net 8.0 # see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install RUN wget -q "https://dot.net/v1/dotnet-install.sh" \ && chmod a+x dotnet-install.sh \ -&& ./dotnet-install.sh -c 6.0 -i /usr/local/bin +&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin # Trigger first run experience by running arbitrary cmd RUN dotnet --info diff --git a/cmake/docker/rockylinux/dotnet.Dockerfile b/cmake/docker/rockylinux/dotnet.Dockerfile index c973a59f2f..7e4fbb4995 100644 --- a/cmake/docker/rockylinux/dotnet.Dockerfile +++ b/cmake/docker/rockylinux/dotnet.Dockerfile @@ -5,7 +5,7 @@ FROM ortools/cmake:rockylinux_swig AS env RUN wget -q "https://dot.net/v1/dotnet-install.sh" \ && chmod a+x dotnet-install.sh \ && ./dotnet-install.sh -c 3.1 -i /usr/local/bin \ -&& ./dotnet-install.sh -c 6.0 -i /usr/local/bin +&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin # Trigger first run experience by running arbitrary cmd RUN dotnet --info