1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-09 17:44:48 +09:00

Fix Codespaces prebuild after CMake upgrade and set policy in Mono (#88410)

The prebuild on Codespaces broke after the minimum CMake version was bumped in https://github.com/dotnet/runtime/pull/86530 because the container was still using Ubuntu 20.04 (Focal) which only has CMake 3.16.1.

Upgrade to Ubuntu 22.04 (Jammy) so we have a new enough CMake.

Also fix a missing policy in the Mono CMakeLists.txt that was accidentally removed.
This commit is contained in:
Alexander Köplinger 2023-07-05 21:00:40 +02:00 committed by GitHub
parent 3f19af848a
commit b2eb4cd88e
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 20 deletions

View file

@ -1,22 +1,22 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile
# For details on dotnet specific container, see: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet # For details on dotnet specific container, see: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet
# [Choice] .NET version: 6.0, 3.1 # [Choice] .NET version: 6.0, 7.0
ARG VARIANT="6.0-focal" ARG VARIANT="6.0-jammy"
FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT} FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT}
# Set up machine requirements to build the repo and the gh CLI # Set up machine requirements to build the repo and the gh CLI
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends \ && apt-get -y install --no-install-recommends \
cmake \ cmake \
llvm-10 \ llvm \
clang-10 \ clang \
build-essential \ build-essential \
python \ python3 \
curl \ curl \
git \ git \
lldb-6.0 \ lldb \
liblldb-6.0-dev \ liblldb-dev \
libunwind8 \ libunwind8 \
libunwind8-dev \ libunwind8-dev \
gettext \ gettext \

View file

@ -4,9 +4,8 @@
"build": { "build": {
"dockerfile": "Dockerfile", "dockerfile": "Dockerfile",
"args": { "args": {
// Update 'VARIANT' to pick a .NET Core version: 3.1, 6.0 // Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
// Append -bullseye or -focal to pin to an OS version. "VARIANT": "6.0-jammy"
"VARIANT": "6.0-focal"
} }
}, },
"hostRequirements": { "hostRequirements": {

View file

@ -1,22 +1,22 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile
# For details on dotnet specific container, see: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet # For details on dotnet specific container, see: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet
# [Choice] .NET version: 6.0, 3.1 # [Choice] .NET version: 6.0, 7.0
ARG VARIANT="6.0-focal" ARG VARIANT="6.0-jammy"
FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT} FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT}
# Set up machine requirements to build the repo and the gh CLI # Set up machine requirements to build the repo and the gh CLI
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends \ && apt-get -y install --no-install-recommends \
cmake \ cmake \
llvm-10 \ llvm \
clang-10 \ clang \
build-essential \ build-essential \
python \ python3 \
curl \ curl \
git \ git \
lldb-6.0 \ lldb \
liblldb-6.0-dev \ liblldb-dev \
libunwind8 \ libunwind8 \
libunwind8-dev \ libunwind8-dev \
gettext \ gettext \

View file

@ -4,9 +4,8 @@
"build": { "build": {
"dockerfile": "Dockerfile", "dockerfile": "Dockerfile",
"args": { "args": {
// Update 'VARIANT' to pick a .NET Core version: 3.1, 6.0 // Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
// Append -bullseye or -focal to pin to an OS version. "VARIANT": "6.0-jammy"
"VARIANT": "6.0-focal"
} }
}, },
"hostRequirements": { "hostRequirements": {

View file

@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 3.20) cmake_minimum_required(VERSION 3.20)
cmake_policy(SET CMP0091 NEW)
project(mono) project(mono)
include(../../eng/native/configurepaths.cmake) include(../../eng/native/configurepaths.cmake)