From 1072e9a00dc1683f5d9a30b1a5e9067a7a8a0f55 Mon Sep 17 00:00:00 2001 From: Lambourl Date: Wed, 18 Jun 2025 18:16:59 +0200 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=86=95=20add=20a=20linux=20custom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linux-custom.cmake | 0 linux-custom.cmake.layers.json | 4 ++++ linux-custom.pkr.js/linux-custom.Dockerfile | 16 +++++++++++++++ linux-custom.pkr.js/linux-custom.pkr.js | 20 +++++++++++++++++++ .../linux-ubuntu-2404.Dockerfile | 4 ++-- 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 linux-custom.cmake create mode 100644 linux-custom.cmake.layers.json create mode 100644 linux-custom.pkr.js/linux-custom.Dockerfile create mode 100644 linux-custom.pkr.js/linux-custom.pkr.js diff --git a/linux-custom.cmake b/linux-custom.cmake new file mode 100644 index 0000000..e69de29 diff --git a/linux-custom.cmake.layers.json b/linux-custom.cmake.layers.json new file mode 100644 index 0000000..00c30ec --- /dev/null +++ b/linux-custom.cmake.layers.json @@ -0,0 +1,4 @@ +[ + "!linux-*/**", + "linux-custom*" +] \ No newline at end of file diff --git a/linux-custom.pkr.js/linux-custom.Dockerfile b/linux-custom.pkr.js/linux-custom.Dockerfile new file mode 100644 index 0000000..a72c3b1 --- /dev/null +++ b/linux-custom.pkr.js/linux-custom.Dockerfile @@ -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 + diff --git a/linux-custom.pkr.js/linux-custom.pkr.js b/linux-custom.pkr.js/linux-custom.pkr.js new file mode 100644 index 0000000..2739cb0 --- /dev/null +++ b/linux-custom.pkr.js/linux-custom.pkr.js @@ -0,0 +1,20 @@ +{ + "variables": { }, + "builders": [ + { + "type": "docker", + "image": "tipibuild/tipi-ubuntu-2404:{{tipi_cli_local_version}}", + "commit": true + } + ], + "post-processors": [ + { + "type": "docker-tag", + "repository": "linux", + "tag": "latest" + } + ] + ,"_tipi_version":"{{tipi_version_hash}}" + + +} \ No newline at end of file diff --git a/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile b/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile index a72c3b1..014ad79 100644 --- a/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile +++ b/linux-ubuntu-2404.pkr.js/linux-ubuntu-2404.Dockerfile @@ -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 From 440ad0785d6891119ce508307b31b6916900d7f6 Mon Sep 17 00:00:00 2001 From: Lambourl Date: Wed, 18 Jun 2025 19:57:19 +0200 Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=94=A7=20rename=20the=20docker=20to?= =?UTF-8?q?=20use=20in=20linux-custom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linux-custom.pkr.js/linux-custom.pkr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-custom.pkr.js/linux-custom.pkr.js b/linux-custom.pkr.js/linux-custom.pkr.js index 2739cb0..7306ada 100644 --- a/linux-custom.pkr.js/linux-custom.pkr.js +++ b/linux-custom.pkr.js/linux-custom.pkr.js @@ -3,7 +3,7 @@ "builders": [ { "type": "docker", - "image": "tipibuild/tipi-ubuntu-2404:{{tipi_cli_local_version}}", + "image": "tipibuild/tipi-linux-custom:{{tipi_cli_local_version}}", "commit": true } ], From 560a04cd6aab5b1a88fe4fe450cc6efec83b1fb2 Mon Sep 17 00:00:00 2001 From: Lambourl Date: Thu, 19 Jun 2025 13:30:35 +0200 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=94=A7=20add=20linux=20alma=20custom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linux-custom-almalinux-95.cmake | 0 linux-custom-almalinux-95.cmake.layers.json | 4 ++++ .../linux-custom-almalinux-95.Dockerfile | 14 ++++++++++++++ .../linux-custom-almalinux-95pkr.js | 17 +++++++++++++++++ linux-custom.pkr.js/linux-custom.pkr.js | 4 +--- 5 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 linux-custom-almalinux-95.cmake create mode 100644 linux-custom-almalinux-95.cmake.layers.json create mode 100644 linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.Dockerfile create mode 100644 linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95pkr.js diff --git a/linux-custom-almalinux-95.cmake b/linux-custom-almalinux-95.cmake new file mode 100644 index 0000000..e69de29 diff --git a/linux-custom-almalinux-95.cmake.layers.json b/linux-custom-almalinux-95.cmake.layers.json new file mode 100644 index 0000000..58509eb --- /dev/null +++ b/linux-custom-almalinux-95.cmake.layers.json @@ -0,0 +1,4 @@ +[ + "!linux-*/**", + "linux-custom-almalinux-95*" +] \ No newline at end of file diff --git a/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.Dockerfile b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.Dockerfile new file mode 100644 index 0000000..72fec18 --- /dev/null +++ b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.Dockerfile @@ -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 \ No newline at end of file diff --git a/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95pkr.js b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95pkr.js new file mode 100644 index 0000000..d12390f --- /dev/null +++ b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95pkr.js @@ -0,0 +1,17 @@ +{ + "variables": { }, + "builders": [ + { + "type": "docker", + "image": "tipibuild/linux-custom-almalinux-95:{{cmake_re_source_hash}}", + "commit": true + } + ], + "post-processors": [ + { + "type": "docker-tag", + "repository": "linux", + "tag": "latest" + } + ] +} \ No newline at end of file diff --git a/linux-custom.pkr.js/linux-custom.pkr.js b/linux-custom.pkr.js/linux-custom.pkr.js index 7306ada..7ba8eb5 100644 --- a/linux-custom.pkr.js/linux-custom.pkr.js +++ b/linux-custom.pkr.js/linux-custom.pkr.js @@ -3,7 +3,7 @@ "builders": [ { "type": "docker", - "image": "tipibuild/tipi-linux-custom:{{tipi_cli_local_version}}", + "image": "tipibuild/tipi-linux-custom:{{cmake_re_source_hash}}", "commit": true } ], @@ -14,7 +14,5 @@ "tag": "latest" } ] - ,"_tipi_version":"{{tipi_version_hash}}" - } \ No newline at end of file From c45893b8720b4df73915d2800e1d330827c81cf9 Mon Sep 17 00:00:00 2001 From: Lambourl Date: Thu, 19 Jun 2025 13:56:34 +0200 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=94=A7=20fix=20typo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...custom-almalinux-95pkr.js => linux-custom-almalinux-95.pkr.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename linux-custom-almalinux-95.pkr.js/{linux-custom-almalinux-95pkr.js => linux-custom-almalinux-95.pkr.js} (100%) diff --git a/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95pkr.js b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js similarity index 100% rename from linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95pkr.js rename to linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js From de7fbb2985a92e87618952ea4523238cbb0591c7 Mon Sep 17 00:00:00 2001 From: Lambourl Date: Fri, 20 Jun 2025 12:46:35 +0200 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=94=A7=20add=20a=20base=20toolchain?= =?UTF-8?q?=20to=20linux-ubuntu-2404.cmake?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../linux-custom-almalinux-95.pkr.js | 2 +- linux-custom.pkr.js/linux-custom.pkr.js | 2 +- linux-ubuntu-2404.cmake | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js index d12390f..faef36a 100644 --- a/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js +++ b/linux-custom-almalinux-95.pkr.js/linux-custom-almalinux-95.pkr.js @@ -3,7 +3,7 @@ "builders": [ { "type": "docker", - "image": "tipibuild/linux-custom-almalinux-95:{{cmake_re_source_hash}}", + "image": "linux-custom-almalinux-95:{{cmake_re_source_hash}}", "commit": true } ], diff --git a/linux-custom.pkr.js/linux-custom.pkr.js b/linux-custom.pkr.js/linux-custom.pkr.js index 7ba8eb5..57918e8 100644 --- a/linux-custom.pkr.js/linux-custom.pkr.js +++ b/linux-custom.pkr.js/linux-custom.pkr.js @@ -3,7 +3,7 @@ "builders": [ { "type": "docker", - "image": "tipibuild/tipi-linux-custom:{{cmake_re_source_hash}}", + "image": "linux-custom:{{cmake_re_source_hash}}", "commit": true } ], diff --git a/linux-ubuntu-2404.cmake b/linux-ubuntu-2404.cmake index e69de29..5d073aa 100644 --- a/linux-ubuntu-2404.cmake +++ b/linux-ubuntu-2404.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/linux-cxx17.cmake") \ No newline at end of file From 9c134ee7956cdb0797f7e13016d8c0597f838e74 Mon Sep 17 00:00:00 2001 From: Lambourl Date: Wed, 25 Jun 2025 11:46:38 +0200 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=94=A7=20add=20vs-17-2022=20toolchain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_engine_mapping.json | 4 +++- vs-17-2022-win64-cxx17.cmake | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 vs-17-2022-win64-cxx17.cmake diff --git a/build_engine_mapping.json b/build_engine_mapping.json index 2663e9c..1d1b564 100644 --- a/build_engine_mapping.json +++ b/build_engine_mapping.json @@ -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" + } \ No newline at end of file diff --git a/vs-17-2022-win64-cxx17.cmake b/vs-17-2022-win64-cxx17.cmake new file mode 100644 index 0000000..fb35c89 --- /dev/null +++ b/vs-17-2022-win64-cxx17.cmake @@ -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 )