Skip to content

Add linux custom + vs-17-2022 #37

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

Merged
merged 8 commits into from
Jul 9, 2025
Merged

Add linux custom + vs-17-2022 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1072e9a
🆕 add a linux custom
Lambourl Jun 18, 2025
440ad07
🔧 rename the docker to use in linux-custom
Lambourl Jun 18, 2025
49e822f
Merge remote-tracking branch 'origin/feature/environments-new-source-…
Lambourl Jun 19, 2025
560a04c
🔧 add linux alma custom
Lambourl Jun 19, 2025
c45893b
🔧 fix typo
Lambourl Jun 19, 2025
de7fbb2
🔧 add a base toolchain to linux-ubuntu-2404.cmake
Lambourl Jun 20, 2025
9c134ee
🔧 add vs-17-2022 toolchain
Lambourl Jun 25, 2025
7df1593
Merge branch 'feature/add-linux-custom' into feature/ubuntu-24-04-vs-…
Lambourl Jun 30, 2025
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
4 changes: 3 additions & 1 deletion build_engine_mapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"vs-15-2017-win64-cxx17" : "Visual Studio 15 2017 Win64",
"vs-16-2019-win64-cxx17" : "Visual Studio 16 2019"
"vs-16-2019-win64-cxx17" : "Visual Studio 16 2019",
"vs-17-2022-win64-cxx17" : "Visual Studio 17 2022"

}
Empty file added linux-custom-almalinux-95.cmake
View file
Open in desktop
Empty file.
4 changes: 4 additions & 0 deletions linux-custom-almalinux-95.cmake.layers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[
"!linux-*/**",
"linux-custom-almalinux-95*"
]
14 changes: 14 additions & 0 deletions linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
ARG ALMALINUX_9_5="almalinux@sha256:91387bd5b12c2626c9b01a8062e6dd02cdf3a9d4b9ba705631c01597f9e3ae06"
FROM ${ALMALINUX_9_5}

# Install tipi and cmake-re
ENV TIPI_DISTRO_MODE=default
ENV TIPI_INSTALL_LEGACY_PACKAGES=OFF
ENV SUDO_GROUP=wheel
ENV TIPI_INSTALL_SOURCE=file:///tipi-linux-x86_64.zip
COPY /tipi-linux-x86_64.zip .
RUN curl -fsSL https://raw.githubusercontent.com/tipi-build/cli/c14014db11342118f65ef95520a70f43c17ca453/install/container/centos.sh -o centos.sh && /bin/bash centos.sh

USER tipi
WORKDIR /home/tipi
EXPOSE 22
17 changes: 17 additions & 0 deletions linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"variables": { },
"builders": [
{
"type": "docker",
"image": "linux-custom-almalinux-95:{{cmake_re_source_hash}}",
"commit": true
}
],
"post-processors": [
{
"type": "docker-tag",
"repository": "linux",
"tag": "latest"
}
]
}
Empty file added linux-custom.cmake
View file
Open in desktop
Empty file.
4 changes: 4 additions & 0 deletions linux-custom.cmake.layers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[
"!linux-*/**",
"linux-custom*"
]
16 changes: 16 additions & 0 deletions linux-custom.pkr.js/linux-custom.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ARG UBUNTU_24_04="ubuntu@sha256:04f510bf1f2528604dc2ff46b517dbdbb85c262d62eacc4aa4d3629783036096"
FROM ${UBUNTU_24_04}

ENV TIPI_DISTRO_MODE=default
ENV TIPI_INSTALL_LEGACY_PACKAGES=OFF
ENV TIPI_INSTALL_SOURCE=file:///tipi-linux-x86_64.zip
COPY /tipi-linux-x86_64.zip .

ARG DEBIAN_FRONTEND=noninteractive # avoid tzdata asking for configuration
# Install tipi and cmake-re
RUN apt update -y && apt install -y curl gettext
RUN curl -fsSL https://raw.githubusercontent.com/tipi-build/cli/c14014db11342118f65ef95520a70f43c17ca453/install/container/ubuntu.sh -o ubuntu.sh && /bin/bash ubuntu.sh
USER tipi
WORKDIR /home/tipi
EXPOSE 22

18 changes: 18 additions & 0 deletions linux-custom.pkr.js/linux-custom.pkr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"variables": { },
"builders": [
{
"type": "docker",
"image": "linux-custom:{{cmake_re_source_hash}}",
"commit": true
}
],
"post-processors": [
{
"type": "docker-tag",
"repository": "linux",
"tag": "latest"
}
]

}
1 change: 1 addition & 0 deletions linux-ubuntu-2404.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include("${CMAKE_CURRENT_LIST_DIR}/linux-cxx17.cmake")
4 changes: 2 additions & 2 deletions linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ARG UBUNTU_24_04="ubuntu@sha256:04f510bf1f2528604dc2ff46b517dbdbb85c262d62eacc4aa4d3629783036096"
FROM ${UBUNTU_24_04}

ENV TIPI_DISTRO_MODE=default
ENV TIPI_DISTRO_MODE=all
ENV TIPI_INSTALL_LEGACY_PACKAGES=OFF
ENV TIPI_INSTALL_SOURCE=file:///tipi-linux-x86_64.zip
COPY /tipi-linux-x86_64.zip .

ARG DEBIAN_FRONTEND=noninteractive # avoid tzdata asking for configuration
# Install tipi and cmake-re
RUN apt update -y && apt install -y curl gettext
RUN apt update -y && apt install -y curl gettext build-essential
RUN curl -fsSL https://raw.githubusercontent.com/tipi-build/cli/c14014db11342118f65ef95520a70f43c17ca453/install/container/ubuntu.sh -o ubuntu.sh && /bin/bash ubuntu.sh
USER tipi
WORKDIR /home/tipi
Expand Down
29 changes: 29 additions & 0 deletions vs-17-2022-win64-cxx17.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright (c) 2015-2017, Ruslan Baratov
# All rights reserved.

if(DEFINED POLLY_VS_17_2022_WIN64_CXX17_CMAKE_)
return()
else()
set(POLLY_VS_17_2022_WIN64_CXX17_CMAKE_ 1)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")

polly_init(
"Visual Studio 17 2022 Win64 / C++17"
"Visual Studio 17 2022"
)

include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/flags/vs-cxx17.cmake")

add_compile_definitions(
NOMINMAX
WIN32_LEAN_AND_MEAN
_WIN32_WINNT=0x0A00 # We have to set the windows version targeted
WINVER=0x0A00 # We have to set the windows version targeted
LYRA_CONFIG_OPTIONAL_TYPE=std::optional

)

set (CMAKE_SYSTEM_VERSION "10.0.22621.0" CACHE STRING "Ensure WinSDK is recent enough to compile in C++17" FORCE )