From f8675a04fc9995cca94a21facc5707eb7d54b654 Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Fri, 29 May 2026 16:24:05 +0400 Subject: [PATCH 1/2] ci: remove disabled CircleCI config Signed-off-by: Darafei Praliaskouski --- .circleci/config.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 6ad9b52d0..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: 2.1 - -jobs: -# build: -# docker: -# - image: cimg/base:stable -# steps: -# - checkout -# - run: echo "This job is configured but will never run because it's commented out." - -workflows: -# version: 2 -# build_and_test: -# jobs: -# - build - -# This config file is a placeholder and does not define any active jobs or workflows. From 57874f98352405d7da7ff5c5ddebb47bc3339dcf Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Fri, 29 May 2026 16:43:22 +0400 Subject: [PATCH 2/2] ci: pin nlohmann json source version Signed-off-by: Darafei Praliaskouski --- 16-master/Dockerfile | 3 +-- 17-master/Dockerfile | 3 +-- 18-master/Dockerfile | 3 +-- Dockerfile.master.template | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/16-master/Dockerfile b/16-master/Dockerfile index 8f322d6a1..9001fb652 100644 --- a/16-master/Dockerfile +++ b/16-master/Dockerfile @@ -88,13 +88,12 @@ RUN set -ex \ ARG DOCKER_CMAKE_BUILD_TYPE ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} +ENV NLOHMANN_JSON_VERSION=3.12.0 # nlohmann/json - header-only library for SFCGAL (with CMake support) RUN set -ex \ && mkdir -p /usr/src \ && cd /usr/src \ - # Get the latest release version dynamically - && NLOHMANN_JSON_VERSION=$(curl -s https://api.github.com/repos/nlohmann/json/releases/latest | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/') \ && echo "Installing nlohmann/json version: ${NLOHMANN_JSON_VERSION}" \ # Download and extract the full source with CMake support && curl -L "https://github.com/nlohmann/json/archive/refs/tags/v${NLOHMANN_JSON_VERSION}.tar.gz" -o nlohmann-json.tar.gz \ diff --git a/17-master/Dockerfile b/17-master/Dockerfile index 185c8854b..549b5d28b 100644 --- a/17-master/Dockerfile +++ b/17-master/Dockerfile @@ -88,13 +88,12 @@ RUN set -ex \ ARG DOCKER_CMAKE_BUILD_TYPE ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} +ENV NLOHMANN_JSON_VERSION=3.12.0 # nlohmann/json - header-only library for SFCGAL (with CMake support) RUN set -ex \ && mkdir -p /usr/src \ && cd /usr/src \ - # Get the latest release version dynamically - && NLOHMANN_JSON_VERSION=$(curl -s https://api.github.com/repos/nlohmann/json/releases/latest | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/') \ && echo "Installing nlohmann/json version: ${NLOHMANN_JSON_VERSION}" \ # Download and extract the full source with CMake support && curl -L "https://github.com/nlohmann/json/archive/refs/tags/v${NLOHMANN_JSON_VERSION}.tar.gz" -o nlohmann-json.tar.gz \ diff --git a/18-master/Dockerfile b/18-master/Dockerfile index 4a41fb88a..02d810952 100644 --- a/18-master/Dockerfile +++ b/18-master/Dockerfile @@ -88,13 +88,12 @@ RUN set -ex \ ARG DOCKER_CMAKE_BUILD_TYPE ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} +ENV NLOHMANN_JSON_VERSION=3.12.0 # nlohmann/json - header-only library for SFCGAL (with CMake support) RUN set -ex \ && mkdir -p /usr/src \ && cd /usr/src \ - # Get the latest release version dynamically - && NLOHMANN_JSON_VERSION=$(curl -s https://api.github.com/repos/nlohmann/json/releases/latest | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/') \ && echo "Installing nlohmann/json version: ${NLOHMANN_JSON_VERSION}" \ # Download and extract the full source with CMake support && curl -L "https://github.com/nlohmann/json/archive/refs/tags/v${NLOHMANN_JSON_VERSION}.tar.gz" -o nlohmann-json.tar.gz \ diff --git a/Dockerfile.master.template b/Dockerfile.master.template index 6a8e64bcd..fa2b60a3a 100644 --- a/Dockerfile.master.template +++ b/Dockerfile.master.template @@ -88,13 +88,12 @@ RUN set -ex \ ARG DOCKER_CMAKE_BUILD_TYPE ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} +ENV NLOHMANN_JSON_VERSION=3.12.0 # nlohmann/json - header-only library for SFCGAL (with CMake support) RUN set -ex \ && mkdir -p /usr/src \ && cd /usr/src \ - # Get the latest release version dynamically - && NLOHMANN_JSON_VERSION=$(curl -s https://api.github.com/repos/nlohmann/json/releases/latest | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/') \ && echo "Installing nlohmann/json version: ${NLOHMANN_JSON_VERSION}" \ # Download and extract the full source with CMake support && curl -L "https://github.com/nlohmann/json/archive/refs/tags/v${NLOHMANN_JSON_VERSION}.tar.gz" -o nlohmann-json.tar.gz \