From 08033bdae934928c177109e347d6c8972510077b Mon Sep 17 00:00:00 2001 From: MarioIvancik Date: Fri, 6 Sep 2024 12:14:13 +0200 Subject: [PATCH 1/3] ubuntu 24.04; debian12 packages built by gcc13 --- example/docker/debian11/Dockerfile | 27 --------------- example/docker/debian12/Dockerfile | 18 ++++++++-- example/docker/ubuntu2004/Dockerfile | 34 ------------------- example/docker/ubuntu2204/Dockerfile | 9 +++-- example/docker/ubuntu2310/Dockerfile | 27 --------------- .../{ubuntu2304 => ubuntu2404}/Dockerfile | 16 ++------- .../package/ba-logger/ba-logger_debug.json | 11 +++--- .../package/ba-logger/ba-logger_release.json | 11 +++--- example/package/boost/boost_debug.json | 11 +++--- example/package/boost/boost_release.json | 11 +++--- example/package/bzip2/bzip2_debug.json | 5 +-- example/package/bzip2/bzip2_release.json | 5 +-- .../package/cpprestsdk/cpprestsdk_debug.json | 8 ++--- .../cpprestsdk/cpprestsdk_release.json | 8 ++--- example/package/curl/curl_debug.json | 5 +-- example/package/curl/curl_release.json | 5 +-- example/package/cxxopts/cxxopts_v3_debug.json | 5 +-- .../package/cxxopts/cxxopts_v3_release.json | 5 +-- example/package/expat/expat_debug.json | 5 +-- example/package/expat/expat_release.json | 5 +-- .../fleet_http_client_debug.json | 11 +++--- .../fleet_http_client_release.json | 11 +++--- .../fleet_protocol_cpp_debug.json | 5 +-- .../fleet_protocol_cpp_release.json | 5 +-- .../fleet_protocol_debug.json | 7 ++-- .../fleet_protocol_release.json | 7 ++-- .../internal_client_debug.json | 7 ++-- .../internal_client_release.json | 7 ++-- example/package/gtest/gtest_debug.json | 5 +-- example/package/gtest/gtest_release.json | 5 +-- .../package/libosmium/libosmium_debug.json | 5 +-- .../package/libosmium/libosmium_release.json | 5 +-- example/package/lz4/lz4_debug.json | 5 +-- example/package/lz4/lz4_release.json | 5 +-- example/package/modbuspp/modbuspp_debug.json | 5 +-- .../package/modbuspp/modbuspp_release.json | 5 +-- example/package/msgpack/msgpack_debug.json | 5 +-- example/package/msgpack/msgpack_release.json | 5 +-- .../nlohmannjson/nlohmannjson_debug.json | 5 +-- .../nlohmannjson/nlohmannjson_release.json | 5 +-- .../package/pahomqttc/pahomqttc_debug.json | 5 +-- .../package/pahomqttc/pahomqttc_release.json | 5 +-- .../pahomqttcpp/pahomqttcpp_debug.json | 9 +++-- .../pahomqttcpp/pahomqttcpp_release.json | 9 +++-- .../protobuf/protobuf_debug_v21.12.json | 7 ++-- .../protobuf/protobuf_release_v21.12.json | 7 ++-- .../package/protozero/protozero_debug.json | 5 +-- .../package/protozero/protozero_release.json | 5 +-- example/package/spdlog/spdlog_debug.json | 11 +++--- example/package/spdlog/spdlog_release.json | 11 +++--- .../package/statesmurf/statesmurf_debug.json | 11 +++--- .../statesmurf/statesmurf_release.json | 11 +++--- example/package/zlib/zlib_debug.json | 7 ++-- example/package/zlib/zlib_release.json | 7 ++-- 54 files changed, 122 insertions(+), 339 deletions(-) delete mode 100644 example/docker/debian11/Dockerfile delete mode 100644 example/docker/ubuntu2004/Dockerfile delete mode 100644 example/docker/ubuntu2310/Dockerfile rename example/docker/{ubuntu2304 => ubuntu2404}/Dockerfile (58%) diff --git a/example/docker/debian11/Dockerfile b/example/docker/debian11/Dockerfile deleted file mode 100644 index f7cd20c..0000000 --- a/example/docker/debian11/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM debian:11.2 - -USER root -RUN echo root:1234 | chpasswd - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - build-essential binutils lsb-release make git libssl-dev openssh-server wget patchelf && \ - rm -rf /var/lib/apt/lists/* - -RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \ - chmod +x cmake.sh && \ - ./cmake.sh --skip-license --prefix=/usr/local && \ - rm ./cmake.sh - -RUN apt-get update && \ - apt-get purge -y \ - wget && \ - rm -rf /var/lib/apt/lists/* - -RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib -RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc - -RUN sed -ri 's/#?PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config -RUN mkdir -p /run/sshd - -ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"] diff --git a/example/docker/debian12/Dockerfile b/example/docker/debian12/Dockerfile index a52f804..cbd6d6d 100644 --- a/example/docker/debian12/Dockerfile +++ b/example/docker/debian12/Dockerfile @@ -5,9 +5,20 @@ RUN echo root:1234 | chpasswd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ - build-essential binutils lsb-release make git libssl-dev openssh-server wget patchelf && \ + build-essential binutils lsb-release make git libssl-dev openssh-server wget patchelf software-properties-common flex && \ rm -rf /var/lib/apt/lists/* +RUN git clone git://gcc.gnu.org/git/gcc.git /gcc && \ + cd /gcc && \ + git checkout releases/gcc-13 && \ + contrib/download_prerequisites && \ + mkdir objdir + +RUN cd /gcc/objdir && \ + ../configure --enable-languages=c,c++ --disable-multilib && \ + make -j$(nproc) && \ + make install + RUN wget "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-linux-x86_64.sh" -O cmake.sh && \ chmod +x cmake.sh && \ ./cmake.sh --skip-license --prefix=/usr/local && \ @@ -19,7 +30,10 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib -RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc +RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc && \ + echo "export CC=/usr/local/bin/gcc" >> /root/.bashrc && \ + echo "export CXX=/usr/local/bin/g++" >> /root/.bashrc && \ + echo "export LD_LIBRARY_PATH=/usr/local/lib64" >> /root/.bashrc RUN sed -ri 's/#?PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config RUN mkdir -p /run/sshd diff --git a/example/docker/ubuntu2004/Dockerfile b/example/docker/ubuntu2004/Dockerfile deleted file mode 100644 index 5374c1f..0000000 --- a/example/docker/ubuntu2004/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM ubuntu:focal - -USER root -RUN echo root:1234 | chpasswd - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - build-essential make libssl-dev coreutils lsb-release wget g++-10 gcc-10 patchelf && \ - rm -rf /var/lib/apt/lists/* - -RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 --slave /usr/bin/g++ g++ /usr/bin/g++-10 - -RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \ - chmod +x cmake.sh && \ - ./cmake.sh --skip-license --prefix=/usr/local && \ - rm ./cmake.sh - -RUN apt-get update && \ - apt-get purge -y \ - wget && \ - rm -rf /var/lib/apt/lists/* - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - openssh-server git && \ - rm -rf /var/lib/apt/lists/* - -RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib -RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc - -RUN sed -ri 's/#?PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config -RUN mkdir -p /run/sshd - -ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"] diff --git a/example/docker/ubuntu2204/Dockerfile b/example/docker/ubuntu2204/Dockerfile index 40c6868..215c690 100644 --- a/example/docker/ubuntu2204/Dockerfile +++ b/example/docker/ubuntu2204/Dockerfile @@ -4,9 +4,14 @@ USER root RUN echo root:1234 | chpasswd RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common && \ + add-apt-repository ppa:ubuntu-toolchain-r/test + + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ - coreutils lsb-release build-essential openssh-server git libssl-dev wget patchelf && \ - rm -rf /var/lib/apt/lists/* + coreutils lsb-release build-essential openssh-server git libssl-dev wget gcc-13 g++-13 patchelf && \ + rm -rf /var/lib/apt/lists/* && \ + update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \ chmod +x cmake.sh && \ diff --git a/example/docker/ubuntu2310/Dockerfile b/example/docker/ubuntu2310/Dockerfile deleted file mode 100644 index baa3027..0000000 --- a/example/docker/ubuntu2310/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM ubuntu:23.10 - -USER root -RUN echo root:1234 | chpasswd - -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y \ - coreutils lsb-release build-essential openssh-server git libssl-dev wget patchelf && \ - rm -rf /var/lib/apt/lists/* - -RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \ - chmod +x cmake.sh && \ - ./cmake.sh --skip-license --prefix=/usr/local && \ - rm ./cmake.sh - -RUN apt-get update && \ - apt-get purge -y \ - wget && \ - rm -rf /var/lib/apt/lists/* - -RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib -RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc - -RUN sed -ri 's/#?PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config -RUN mkdir -p /run/sshd - -ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"] diff --git a/example/docker/ubuntu2304/Dockerfile b/example/docker/ubuntu2404/Dockerfile similarity index 58% rename from example/docker/ubuntu2304/Dockerfile rename to example/docker/ubuntu2404/Dockerfile index b452a49..e52da87 100644 --- a/example/docker/ubuntu2304/Dockerfile +++ b/example/docker/ubuntu2404/Dockerfile @@ -1,27 +1,17 @@ -FROM ubuntu:23.04 +FROM ubuntu:24.04 USER root RUN echo root:1234 | chpasswd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ - coreutils lsb-release build-essential openssh-server git libssl-dev wget patchelf && \ + coreutils lsb-release build-essential openssh-server git libssl-dev patchelf cmake && \ rm -rf /var/lib/apt/lists/* -RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \ - chmod +x cmake.sh && \ - ./cmake.sh --skip-license --prefix=/usr/local && \ - rm ./cmake.sh - -RUN apt-get update && \ - apt-get purge -y \ - wget && \ - rm -rf /var/lib/apt/lists/* - RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc RUN sed -ri 's/#?PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config RUN mkdir -p /run/sshd -ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"] +ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"] \ No newline at end of file diff --git a/example/package/ba-logger/ba-logger_debug.json b/example/package/ba-logger/ba-logger_debug.json index fe53375..3520b1a 100644 --- a/example/package/ba-logger/ba-logger_debug.json +++ b/example/package/ba-logger/ba-logger_debug.json @@ -5,7 +5,7 @@ ], "Git": { "URI": "https://github.com/bringauto/ba-logger.git", - "Revision": "v1.2.0" + "Revision": "v2.0.0" }, "Build": { "CMake": { @@ -19,7 +19,7 @@ }, "Package": { "Name": "ba-logger", - "VersionTag": "v1.2.0", + "VersionTag": "v2.0.0", "PlatformString": { "Mode": "auto" }, @@ -29,12 +29,9 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", - "debian11", "ubuntu2204", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } -} +} \ No newline at end of file diff --git a/example/package/ba-logger/ba-logger_release.json b/example/package/ba-logger/ba-logger_release.json index 5374849..e030122 100644 --- a/example/package/ba-logger/ba-logger_release.json +++ b/example/package/ba-logger/ba-logger_release.json @@ -5,7 +5,7 @@ ], "Git": { "URI": "https://github.com/bringauto/ba-logger.git", - "Revision": "v1.2.0" + "Revision": "v2.0.0" }, "Build": { "CMake": { @@ -19,7 +19,7 @@ }, "Package": { "Name": "ba-logger", - "VersionTag": "v1.2.0", + "VersionTag": "v2.0.0", "PlatformString": { "Mode": "auto" }, @@ -29,12 +29,9 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", - "debian11", "ubuntu2204", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } -} +} \ No newline at end of file diff --git a/example/package/boost/boost_debug.json b/example/package/boost/boost_debug.json index 55ce0f4..7ba7778 100644 --- a/example/package/boost/boost_debug.json +++ b/example/package/boost/boost_debug.json @@ -9,13 +9,13 @@ "CMake": { "Defines": { "CMAKE_BUILD_TYPE": "Debug", - "BOOST_VERSION": "1.78.0" + "BOOST_VERSION": "1.86.0" } } }, "Package": { "Name": "boost", - "VersionTag": "v1.78.0", + "VersionTag": "v1.86.0", "PlatformString": { "Mode": "auto" }, @@ -25,13 +25,10 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "fleet-os-2", - "debian11", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } -} +} \ No newline at end of file diff --git a/example/package/boost/boost_release.json b/example/package/boost/boost_release.json index d5ee09f..3552576 100644 --- a/example/package/boost/boost_release.json +++ b/example/package/boost/boost_release.json @@ -9,13 +9,13 @@ "CMake": { "Defines": { "CMAKE_BUILD_TYPE": "Release", - "BOOST_VERSION": "1.78.0" + "BOOST_VERSION": "1.86.0" } } }, "Package": { "Name": "boost", - "VersionTag": "v1.78.0", + "VersionTag": "v1.86.0", "PlatformString": { "Mode": "auto" }, @@ -25,13 +25,10 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "fleet-os-2", - "debian11", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } -} +} \ No newline at end of file diff --git a/example/package/bzip2/bzip2_debug.json b/example/package/bzip2/bzip2_debug.json index 3252d68..30c1e90 100644 --- a/example/package/bzip2/bzip2_debug.json +++ b/example/package/bzip2/bzip2_debug.json @@ -23,13 +23,10 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", - "debian11", "fleet-os-2", "ubuntu2204", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/bzip2/bzip2_release.json b/example/package/bzip2/bzip2_release.json index 64badf8..cea5b8f 100644 --- a/example/package/bzip2/bzip2_release.json +++ b/example/package/bzip2/bzip2_release.json @@ -23,13 +23,10 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", - "debian11", "fleet-os-2", "ubuntu2204", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/cpprestsdk/cpprestsdk_debug.json b/example/package/cpprestsdk/cpprestsdk_debug.json index 9af053b..add3f17 100644 --- a/example/package/cpprestsdk/cpprestsdk_debug.json +++ b/example/package/cpprestsdk/cpprestsdk_debug.json @@ -10,7 +10,8 @@ "Defines": { "CMAKE_BUILD_TYPE": "Debug", "BUILD_TESTS": "OFF", - "BUILD_SAMPLES": "OFF" + "BUILD_SAMPLES": "OFF", + "CPPREST_EXCLUDE_WEBSOCKETS": "ON" } } }, @@ -26,12 +27,9 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "debian12", - "debian11", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/cpprestsdk/cpprestsdk_release.json b/example/package/cpprestsdk/cpprestsdk_release.json index c43e8e3..b06d21b 100644 --- a/example/package/cpprestsdk/cpprestsdk_release.json +++ b/example/package/cpprestsdk/cpprestsdk_release.json @@ -10,7 +10,8 @@ "Defines": { "CMAKE_BUILD_TYPE": "Release", "BUILD_TESTS": "OFF", - "BUILD_SAMPLES": "OFF" + "BUILD_SAMPLES": "OFF", + "CPPREST_EXCLUDE_WEBSOCKETS": "ON" } } }, @@ -26,12 +27,9 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "debian12", - "debian11", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/curl/curl_debug.json b/example/package/curl/curl_debug.json index d3b3262..bd56933 100644 --- a/example/package/curl/curl_debug.json +++ b/example/package/curl/curl_debug.json @@ -27,12 +27,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/curl/curl_release.json b/example/package/curl/curl_release.json index 857ad42..4dd937b 100644 --- a/example/package/curl/curl_release.json +++ b/example/package/curl/curl_release.json @@ -27,12 +27,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/cxxopts/cxxopts_v3_debug.json b/example/package/cxxopts/cxxopts_v3_debug.json index fb83196..62da7c0 100644 --- a/example/package/cxxopts/cxxopts_v3_debug.json +++ b/example/package/cxxopts/cxxopts_v3_debug.json @@ -27,12 +27,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/cxxopts/cxxopts_v3_release.json b/example/package/cxxopts/cxxopts_v3_release.json index ce3b520..b0ab77b 100644 --- a/example/package/cxxopts/cxxopts_v3_release.json +++ b/example/package/cxxopts/cxxopts_v3_release.json @@ -27,12 +27,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/expat/expat_debug.json b/example/package/expat/expat_debug.json index 7f1add1..c276508 100644 --- a/example/package/expat/expat_debug.json +++ b/example/package/expat/expat_debug.json @@ -26,12 +26,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/expat/expat_release.json b/example/package/expat/expat_release.json index baa2c0d..ba0b446 100644 --- a/example/package/expat/expat_release.json +++ b/example/package/expat/expat_release.json @@ -26,12 +26,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/fleet-http-client-shared/fleet_http_client_debug.json b/example/package/fleet-http-client-shared/fleet_http_client_debug.json index 6fb851f..79f0462 100644 --- a/example/package/fleet-http-client-shared/fleet_http_client_debug.json +++ b/example/package/fleet-http-client-shared/fleet_http_client_debug.json @@ -1,9 +1,9 @@ { "Env": {}, - "DependsOn": [ "zlib", "ba-logger", "boost", "fleet-protocol-interface", "fleet-protocol-cxx-helpers-static", "cpprestsdk" ], + "DependsOn": [ "zlib", "boost", "fleet-protocol-interface", "fleet-protocol-cxx-helpers-static", "cpprestsdk" ], "Git": { "URI": "https://github.com/bringauto/fleet-protocol-http-client-cxx.git", - "Revision": "v1.3.0" + "Revision": "v1.5.0" }, "Build": { "CMake": { @@ -19,7 +19,7 @@ }, "Package": { "Name": "fleet-http-client-shared", - "VersionTag": "v1.3.0", + "VersionTag": "v1.5.0", "PlatformString": { "Mode": "auto" }, @@ -29,12 +29,9 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "debian12", - "debian11", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/fleet-http-client-shared/fleet_http_client_release.json b/example/package/fleet-http-client-shared/fleet_http_client_release.json index bd0424c..386bab2 100644 --- a/example/package/fleet-http-client-shared/fleet_http_client_release.json +++ b/example/package/fleet-http-client-shared/fleet_http_client_release.json @@ -1,9 +1,9 @@ { "Env": {}, - "DependsOn": [ "zlib", "ba-logger", "boost", "fleet-protocol-interface", "fleet-protocol-cxx-helpers-static", "cpprestsdk" ], + "DependsOn": [ "zlib", "boost", "fleet-protocol-interface", "fleet-protocol-cxx-helpers-static", "cpprestsdk" ], "Git": { "URI": "https://github.com/bringauto/fleet-protocol-http-client-cxx.git", - "Revision": "v1.3.0" + "Revision": "v1.5.0" }, "Build": { "CMake": { @@ -19,7 +19,7 @@ }, "Package": { "Name": "fleet-http-client-shared", - "VersionTag": "v1.3.0", + "VersionTag": "v1.5.0", "PlatformString": { "Mode": "auto" }, @@ -29,12 +29,9 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "debian12", - "debian11", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json b/example/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json index d5779a5..3c32ddf 100644 --- a/example/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json +++ b/example/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json @@ -30,12 +30,9 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "debian12", - "debian11", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json b/example/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json index 1c63330..7fb8b46 100644 --- a/example/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json +++ b/example/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json @@ -30,12 +30,9 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "debian12", - "debian11", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/fleet-protocol-interface/fleet_protocol_debug.json b/example/package/fleet-protocol-interface/fleet_protocol_debug.json index 3c1abeb..565f231 100644 --- a/example/package/fleet-protocol-interface/fleet_protocol_debug.json +++ b/example/package/fleet-protocol-interface/fleet_protocol_debug.json @@ -28,13 +28,10 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "debian12", - "debian11", - "ubuntu2304", - "ubuntu2310", - "ubuntu1804-aarch64" + "ubuntu1804-aarch64", + "ubuntu2404" ] } } diff --git a/example/package/fleet-protocol-interface/fleet_protocol_release.json b/example/package/fleet-protocol-interface/fleet_protocol_release.json index 4e8a060..f94dd08 100644 --- a/example/package/fleet-protocol-interface/fleet_protocol_release.json +++ b/example/package/fleet-protocol-interface/fleet_protocol_release.json @@ -28,13 +28,10 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "debian12", - "debian11", - "ubuntu2304", - "ubuntu2310", - "ubuntu1804-aarch64" + "ubuntu1804-aarch64", + "ubuntu2404" ] } } diff --git a/example/package/fleet-protocol-internal-client/internal_client_debug.json b/example/package/fleet-protocol-internal-client/internal_client_debug.json index 8be4254..9d11db8 100644 --- a/example/package/fleet-protocol-internal-client/internal_client_debug.json +++ b/example/package/fleet-protocol-internal-client/internal_client_debug.json @@ -31,13 +31,10 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "debian12", - "debian11", - "ubuntu2304", - "ubuntu2310", - "ubuntu1804-aarch64" + "ubuntu1804-aarch64", + "ubuntu2404" ] } } diff --git a/example/package/fleet-protocol-internal-client/internal_client_release.json b/example/package/fleet-protocol-internal-client/internal_client_release.json index c959a3b..e6bedf7 100644 --- a/example/package/fleet-protocol-internal-client/internal_client_release.json +++ b/example/package/fleet-protocol-internal-client/internal_client_release.json @@ -31,13 +31,10 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "debian12", - "debian11", - "ubuntu2304", - "ubuntu2310", - "ubuntu1804-aarch64" + "ubuntu1804-aarch64", + "ubuntu2404" ] } } diff --git a/example/package/gtest/gtest_debug.json b/example/package/gtest/gtest_debug.json index eabbcfd..92a5c07 100644 --- a/example/package/gtest/gtest_debug.json +++ b/example/package/gtest/gtest_debug.json @@ -24,12 +24,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/gtest/gtest_release.json b/example/package/gtest/gtest_release.json index 77a942b..4ed8534 100644 --- a/example/package/gtest/gtest_release.json +++ b/example/package/gtest/gtest_release.json @@ -24,12 +24,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/libosmium/libosmium_debug.json b/example/package/libosmium/libosmium_debug.json index 735986d..3937b15 100644 --- a/example/package/libosmium/libosmium_debug.json +++ b/example/package/libosmium/libosmium_debug.json @@ -34,13 +34,10 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", - "debian11", "fleet-os-2", "ubuntu2204", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/libosmium/libosmium_release.json b/example/package/libosmium/libosmium_release.json index 6ccea8a..3543b5b 100644 --- a/example/package/libosmium/libosmium_release.json +++ b/example/package/libosmium/libosmium_release.json @@ -34,13 +34,10 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", - "debian11", "fleet-os-2", "ubuntu2204", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/lz4/lz4_debug.json b/example/package/lz4/lz4_debug.json index 8687efd..a642935 100644 --- a/example/package/lz4/lz4_debug.json +++ b/example/package/lz4/lz4_debug.json @@ -25,13 +25,10 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "fleet-os-2", - "debian11", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/lz4/lz4_release.json b/example/package/lz4/lz4_release.json index 062b167..e12323a 100644 --- a/example/package/lz4/lz4_release.json +++ b/example/package/lz4/lz4_release.json @@ -25,13 +25,10 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", "ubuntu2204", "fleet-os-2", - "debian11", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/modbuspp/modbuspp_debug.json b/example/package/modbuspp/modbuspp_debug.json index 7becc47..f02da60 100644 --- a/example/package/modbuspp/modbuspp_debug.json +++ b/example/package/modbuspp/modbuspp_debug.json @@ -25,12 +25,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/modbuspp/modbuspp_release.json b/example/package/modbuspp/modbuspp_release.json index 215928a..7b08270 100644 --- a/example/package/modbuspp/modbuspp_release.json +++ b/example/package/modbuspp/modbuspp_release.json @@ -25,12 +25,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/msgpack/msgpack_debug.json b/example/package/msgpack/msgpack_debug.json index cd553d9..2ade9e6 100644 --- a/example/package/msgpack/msgpack_debug.json +++ b/example/package/msgpack/msgpack_debug.json @@ -27,12 +27,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/msgpack/msgpack_release.json b/example/package/msgpack/msgpack_release.json index 726a1a3..e162c6e 100644 --- a/example/package/msgpack/msgpack_release.json +++ b/example/package/msgpack/msgpack_release.json @@ -27,12 +27,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/nlohmannjson/nlohmannjson_debug.json b/example/package/nlohmannjson/nlohmannjson_debug.json index 786b4e1..ae8771f 100644 --- a/example/package/nlohmannjson/nlohmannjson_debug.json +++ b/example/package/nlohmannjson/nlohmannjson_debug.json @@ -26,12 +26,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/nlohmannjson/nlohmannjson_release.json b/example/package/nlohmannjson/nlohmannjson_release.json index 1847d67..7f9ac8b 100644 --- a/example/package/nlohmannjson/nlohmannjson_release.json +++ b/example/package/nlohmannjson/nlohmannjson_release.json @@ -26,12 +26,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/pahomqttc/pahomqttc_debug.json b/example/package/pahomqttc/pahomqttc_debug.json index 8bff103..dc7b6f5 100644 --- a/example/package/pahomqttc/pahomqttc_debug.json +++ b/example/package/pahomqttc/pahomqttc_debug.json @@ -30,12 +30,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/pahomqttc/pahomqttc_release.json b/example/package/pahomqttc/pahomqttc_release.json index f446fec..2f61557 100644 --- a/example/package/pahomqttc/pahomqttc_release.json +++ b/example/package/pahomqttc/pahomqttc_release.json @@ -30,12 +30,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/pahomqttcpp/pahomqttcpp_debug.json b/example/package/pahomqttcpp/pahomqttcpp_debug.json index 34a5325..bf91292 100644 --- a/example/package/pahomqttcpp/pahomqttcpp_debug.json +++ b/example/package/pahomqttcpp/pahomqttcpp_debug.json @@ -15,7 +15,9 @@ "PAHO_BUILD_SHARED": "ON", "PAHO_BUILD_DOCUMENTATION": "OFF", "PAHO_BUILD_SAMPLES": "OFF", - "PAHO_WITH_SSL": "ON" + "PAHO_WITH_SSL": "ON", + "CMAKE_CXX_STANDARD": "20", + "CMAKE_CXX_STANDARD_REQUIRED": "OFF" } } }, @@ -32,12 +34,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/pahomqttcpp/pahomqttcpp_release.json b/example/package/pahomqttcpp/pahomqttcpp_release.json index da6c9bd..3aae8d2 100644 --- a/example/package/pahomqttcpp/pahomqttcpp_release.json +++ b/example/package/pahomqttcpp/pahomqttcpp_release.json @@ -15,7 +15,9 @@ "PAHO_BUILD_SHARED": "ON", "PAHO_BUILD_DOCUMENTATION": "OFF", "PAHO_BUILD_SAMPLES": "OFF", - "PAHO_WITH_SSL": "ON" + "PAHO_WITH_SSL": "ON", + "CMAKE_CXX_STANDARD": "20", + "CMAKE_CXX_STANDARD_REQUIRED": "OFF" } } }, @@ -32,12 +34,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/protobuf/protobuf_debug_v21.12.json b/example/package/protobuf/protobuf_debug_v21.12.json index 06a8f2f..3db9546 100644 --- a/example/package/protobuf/protobuf_debug_v21.12.json +++ b/example/package/protobuf/protobuf_debug_v21.12.json @@ -28,13 +28,10 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "debian12", "fleet-os-2", - "ubuntu2304", - "ubuntu2310", - "ubuntu1804-aarch64" + "ubuntu1804-aarch64", + "ubuntu2404" ] } } diff --git a/example/package/protobuf/protobuf_release_v21.12.json b/example/package/protobuf/protobuf_release_v21.12.json index c3bbb93..dae9306 100644 --- a/example/package/protobuf/protobuf_release_v21.12.json +++ b/example/package/protobuf/protobuf_release_v21.12.json @@ -28,13 +28,10 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "debian12", "fleet-os-2", - "ubuntu2304", - "ubuntu2310", - "ubuntu1804-aarch64" + "ubuntu1804-aarch64", + "ubuntu2404" ] } } diff --git a/example/package/protozero/protozero_debug.json b/example/package/protozero/protozero_debug.json index a040f32..2b49d5b 100644 --- a/example/package/protozero/protozero_debug.json +++ b/example/package/protozero/protozero_debug.json @@ -26,12 +26,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/protozero/protozero_release.json b/example/package/protozero/protozero_release.json index 11cf8e7..af693db 100644 --- a/example/package/protozero/protozero_release.json +++ b/example/package/protozero/protozero_release.json @@ -26,12 +26,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/spdlog/spdlog_debug.json b/example/package/spdlog/spdlog_debug.json index 4c19524..144e121 100644 --- a/example/package/spdlog/spdlog_debug.json +++ b/example/package/spdlog/spdlog_debug.json @@ -3,7 +3,7 @@ "DependsOn": [], "Git": { "URI": "https://github.com/gabime/spdlog.git", - "Revision": "v1.8.5" + "Revision": "v1.14.1" }, "Build": { "CMake": { @@ -16,7 +16,7 @@ }, "Package": { "Name": "spdlog", - "VersionTag": "v1.8.5", + "VersionTag": "v1.14.1", "PlatformString": { "Mode": "auto" }, @@ -27,12 +27,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } -} +} \ No newline at end of file diff --git a/example/package/spdlog/spdlog_release.json b/example/package/spdlog/spdlog_release.json index 5d80fa2..6fb8bab 100644 --- a/example/package/spdlog/spdlog_release.json +++ b/example/package/spdlog/spdlog_release.json @@ -3,7 +3,7 @@ "DependsOn": [], "Git": { "URI": "https://github.com/gabime/spdlog.git", - "Revision": "v1.8.5" + "Revision": "v1.14.1" }, "Build": { "CMake": { @@ -16,7 +16,7 @@ }, "Package": { "Name": "spdlog", - "VersionTag": "v1.8.5", + "VersionTag": "v1.14.1", "PlatformString": { "Mode": "auto" }, @@ -27,12 +27,9 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } -} +} \ No newline at end of file diff --git a/example/package/statesmurf/statesmurf_debug.json b/example/package/statesmurf/statesmurf_debug.json index 0c6d7cb..652f528 100644 --- a/example/package/statesmurf/statesmurf_debug.json +++ b/example/package/statesmurf/statesmurf_debug.json @@ -5,8 +5,8 @@ "cxxopts" ], "Git": { - "URI": "https://github.com/Melky-Phoe/StateSmurf.git", - "Revision": "v2.0.1" + "URI": "https://github.com/bringauto/StateSmurf.git", + "Revision": "v2.2.0" }, "Build": { "CMake": { @@ -20,7 +20,7 @@ }, "Package": { "Name": "statesmurf", - "VersionTag": "v2.0.1", + "VersionTag": "v2.2.0", "PlatformString": { "Mode": "auto" }, @@ -30,12 +30,9 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", - "debian11", "ubuntu2204", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/statesmurf/statesmurf_release.json b/example/package/statesmurf/statesmurf_release.json index 8e2ea90..8b4f972 100644 --- a/example/package/statesmurf/statesmurf_release.json +++ b/example/package/statesmurf/statesmurf_release.json @@ -5,8 +5,8 @@ "cxxopts" ], "Git": { - "URI": "https://github.com/Melky-Phoe/StateSmurf.git", - "Revision": "v2.0.1" + "URI": "https://github.com/bringauto/StateSmurf.git", + "Revision": "v2.2.0" }, "Build": { "CMake": { @@ -20,7 +20,7 @@ }, "Package": { "Name": "statesmurf", - "VersionTag": "v2.0.1", + "VersionTag": "v2.2.0", "PlatformString": { "Mode": "auto" }, @@ -30,12 +30,9 @@ }, "DockerMatrix": { "ImageNames": [ - "ubuntu2004", - "debian11", "ubuntu2204", "debian12", - "ubuntu2304", - "ubuntu2310" + "ubuntu2404" ] } } diff --git a/example/package/zlib/zlib_debug.json b/example/package/zlib/zlib_debug.json index 4804517..a3228ca 100644 --- a/example/package/zlib/zlib_debug.json +++ b/example/package/zlib/zlib_debug.json @@ -24,13 +24,10 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310", - "ubuntu1804-aarch64" + "ubuntu1804-aarch64", + "ubuntu2404" ] } } diff --git a/example/package/zlib/zlib_release.json b/example/package/zlib/zlib_release.json index 4a842b1..d524e1d 100644 --- a/example/package/zlib/zlib_release.json +++ b/example/package/zlib/zlib_release.json @@ -24,13 +24,10 @@ "DockerMatrix": { "ImageNames": [ "ubuntu2204", - "ubuntu2004", - "debian11", "fleet-os-2", "debian12", - "ubuntu2304", - "ubuntu2310", - "ubuntu1804-aarch64" + "ubuntu1804-aarch64", + "ubuntu2404" ] } } From 147a1eef667344d798aa48c3496af2ca9aed09ba Mon Sep 17 00:00:00 2001 From: MarioIvancik Date: Fri, 6 Sep 2024 12:17:38 +0200 Subject: [PATCH 2/3] update version --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index a5d34d7..fec6339 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -version=0.3.2 \ No newline at end of file +version=0.3.3 \ No newline at end of file From 3af422840e4e1415bb0829532d6ef58844ac2b4d Mon Sep 17 00:00:00 2001 From: Josef Melkus Date: Thu, 12 Sep 2024 09:33:24 +0200 Subject: [PATCH 3/3] shallow clone gcc --- example/docker/debian12/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/example/docker/debian12/Dockerfile b/example/docker/debian12/Dockerfile index cbd6d6d..359d7b6 100644 --- a/example/docker/debian12/Dockerfile +++ b/example/docker/debian12/Dockerfile @@ -8,9 +8,8 @@ RUN apt-get update && \ build-essential binutils lsb-release make git libssl-dev openssh-server wget patchelf software-properties-common flex && \ rm -rf /var/lib/apt/lists/* -RUN git clone git://gcc.gnu.org/git/gcc.git /gcc && \ +RUN git clone --depth=1 --single-branch --branch=releases/gcc-13.3.0 git://gcc.gnu.org/git/gcc.git /gcc && \ cd /gcc && \ - git checkout releases/gcc-13 && \ contrib/download_prerequisites && \ mkdir objdir