From a16d112a76671b7b74660f7913051f3f2d446fea Mon Sep 17 00:00:00 2001 From: melkus Date: Mon, 25 Mar 2024 15:23:45 +0100 Subject: [PATCH 1/4] add fleet-http-client, cpprest --- .../package/cpprestsdk/cpprestsdk_debug.json | 35 ++++++++++++++++ .../cpprestsdk/cpprestsdk_release.json | 35 ++++++++++++++++ .../fleet_http_client_debug.json | 40 +++++++++++++++++++ .../fleet_http_client_release.json | 40 +++++++++++++++++++ 4 files changed, 150 insertions(+) create mode 100644 example/package/cpprestsdk/cpprestsdk_debug.json create mode 100644 example/package/cpprestsdk/cpprestsdk_release.json create mode 100644 example/package/fleet-http-client-shared/fleet_http_client_debug.json create mode 100644 example/package/fleet-http-client-shared/fleet_http_client_release.json diff --git a/example/package/cpprestsdk/cpprestsdk_debug.json b/example/package/cpprestsdk/cpprestsdk_debug.json new file mode 100644 index 0000000..f2bbb51 --- /dev/null +++ b/example/package/cpprestsdk/cpprestsdk_debug.json @@ -0,0 +1,35 @@ +{ + "Env": {}, + "DependsOn": [], + "Git": { + "URI": "git@github.com:microsoft/cpprestsdk.git", + "Revision": "v2.10.15" + }, + "Build": { + "CMake": { + "Defines": { + "CMAKE_BUILD_TYPE": "Debug" + } + } + }, + "Package": { + "Name": "cpprestsdk", + "VersionTag": "v2.10.15", + "PlatformString": { + "Mode": "auto" + }, + "IsLibrary": true, + "IsDevLib": true, + "IsDebug": true + }, + "DockerMatrix": { + "ImageNames": [ + "ubuntu2004", + "ubuntu2204", + "debian12", + "debian11", + "ubuntu2304", + "ubuntu2310" + ] + } +} diff --git a/example/package/cpprestsdk/cpprestsdk_release.json b/example/package/cpprestsdk/cpprestsdk_release.json new file mode 100644 index 0000000..d2667bc --- /dev/null +++ b/example/package/cpprestsdk/cpprestsdk_release.json @@ -0,0 +1,35 @@ +{ + "Env": {}, + "DependsOn": [], + "Git": { + "URI": "git@github.com:microsoft/cpprestsdk.git", + "Revision": "v2.10.15" + }, + "Build": { + "CMake": { + "Defines": { + "CMAKE_BUILD_TYPE": "Release" + } + } + }, + "Package": { + "Name": "cpprestsdk", + "VersionTag": "v2.10.15", + "PlatformString": { + "Mode": "auto" + }, + "IsLibrary": true, + "IsDevLib": true, + "IsDebug": false + }, + "DockerMatrix": { + "ImageNames": [ + "ubuntu2004", + "ubuntu2204", + "debian12", + "debian11", + "ubuntu2304", + "ubuntu2310" + ] + } +} 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 new file mode 100644 index 0000000..7f9816b --- /dev/null +++ b/example/package/fleet-http-client-shared/fleet_http_client_debug.json @@ -0,0 +1,40 @@ +{ + "Env": {}, + "DependsOn": [ "zlib", "ba-logger", "boost", "fleet-protocol-interface", "fleet-protocol-cpp", "cpprestsdk" ], + "Git": { + "URI": "https://github.com/bringauto/fleet-http-client.git", + "Revision": "v1.2.0" + }, + "Build": { + "CMake": { + "Defines": { + "CMAKE_BUILD_TYPE": "Debug", + "BRINGAUTO_INSTALL": "ON", + "BRINGAUTO_PACKAGE": "ON", + "BRINGAUTO_SYSTEM_DEP": "ON", + "BRINGAUTO_SAMPLES" : "OFF", + "BRINGAUTO_TESTS" : "OFF" + } + } + }, + "Package": { + "Name": "fleet-http-client-shared", + "VersionTag": "v1.2.0", + "PlatformString": { + "Mode": "auto" + }, + "IsLibrary": true, + "IsDevLib": true, + "IsDebug": true + }, + "DockerMatrix": { + "ImageNames": [ + "ubuntu2004", + "ubuntu2204", + "debian12", + "debian11", + "ubuntu2304", + "ubuntu2310" + ] + } +} 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 new file mode 100644 index 0000000..2a95e65 --- /dev/null +++ b/example/package/fleet-http-client-shared/fleet_http_client_release.json @@ -0,0 +1,40 @@ +{ + "Env": {}, + "DependsOn": [ "zlib", "ba-logger", "boost", "fleet-protocol-interface", "fleet-protocol-cpp", "cpprestsdk" ], + "Git": { + "URI": "https://github.com/bringauto/fleet-http-client.git", + "Revision": "v1.2.0" + }, + "Build": { + "CMake": { + "Defines": { + "CMAKE_BUILD_TYPE": "Release", + "BRINGAUTO_INSTALL": "ON", + "BRINGAUTO_PACKAGE": "ON", + "BRINGAUTO_SYSTEM_DEP": "ON", + "BRINGAUTO_SAMPLES" : "OFF", + "BRINGAUTO_TESTS" : "OFF" + } + } + }, + "Package": { + "Name": "fleet-http-client-shared", + "VersionTag": "v1.2.0", + "PlatformString": { + "Mode": "auto" + }, + "IsLibrary": true, + "IsDevLib": true, + "IsDebug": false + }, + "DockerMatrix": { + "ImageNames": [ + "ubuntu2004", + "ubuntu2204", + "debian12", + "debian11", + "ubuntu2304", + "ubuntu2310" + ] + } +} From ac22f7b7fa5d21d9eb332f4d4816fe350f97e109 Mon Sep 17 00:00:00 2001 From: Josef Melkus Date: Tue, 26 Mar 2024 20:37:28 +0100 Subject: [PATCH 2/4] add fleet-http-client --- example/docker/debian11/Dockerfile | 2 +- example/docker/debian12/Dockerfile | 2 +- example/docker/fleet-os-2/Dockerfile | 2 +- example/docker/ubuntu2004/Dockerfile | 2 +- example/docker/ubuntu2204/Dockerfile | 2 +- example/docker/ubuntu2304/Dockerfile | 2 +- example/docker/ubuntu2310/Dockerfile | 2 +- example/package/cpprestsdk/cpprestsdk_debug.json | 14 ++++++++------ example/package/cpprestsdk/cpprestsdk_release.json | 14 ++++++++------ example/package/protozero/protozero_debug.json | 1 - example/package/protozero/protozero_release.json | 1 - 11 files changed, 23 insertions(+), 21 deletions(-) diff --git a/example/docker/debian11/Dockerfile b/example/docker/debian11/Dockerfile index f0b4558..f7cd20c 100644 --- a/example/docker/debian11/Dockerfile +++ b/example/docker/debian11/Dockerfile @@ -5,7 +5,7 @@ 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 && \ + 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 && \ diff --git a/example/docker/debian12/Dockerfile b/example/docker/debian12/Dockerfile index 5a9ddff..a52f804 100644 --- a/example/docker/debian12/Dockerfile +++ b/example/docker/debian12/Dockerfile @@ -5,7 +5,7 @@ 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 && \ + 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.25.2/cmake-3.25.2-linux-x86_64.sh" -O cmake.sh && \ diff --git a/example/docker/fleet-os-2/Dockerfile b/example/docker/fleet-os-2/Dockerfile index 9dd0469..092eee1 100644 --- a/example/docker/fleet-os-2/Dockerfile +++ b/example/docker/fleet-os-2/Dockerfile @@ -8,7 +8,7 @@ RUN echo root:1234 | chpasswd # RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ - build-essential xz-utils sed git libssl-dev openssh-server wget unzip python3 make&& \ + build-essential xz-utils sed git libssl-dev openssh-server wget unzip python3 make patchelf && \ rm -rf /var/lib/apt/lists/* RUN wget "https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.sh" -O cmake.sh && \ diff --git a/example/docker/ubuntu2004/Dockerfile b/example/docker/ubuntu2004/Dockerfile index 9a17a5f..5374c1f 100644 --- a/example/docker/ubuntu2004/Dockerfile +++ b/example/docker/ubuntu2004/Dockerfile @@ -5,7 +5,7 @@ RUN echo root:1234 | chpasswd RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ - build-essential cmake make libssl-dev coreutils lsb-release wget g++-10 gcc-10 && \ + 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 diff --git a/example/docker/ubuntu2204/Dockerfile b/example/docker/ubuntu2204/Dockerfile index a241d50..40c6868 100644 --- a/example/docker/ubuntu2204/Dockerfile +++ b/example/docker/ubuntu2204/Dockerfile @@ -5,7 +5,7 @@ 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 && \ + 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 && \ diff --git a/example/docker/ubuntu2304/Dockerfile b/example/docker/ubuntu2304/Dockerfile index d9b0221..b452a49 100644 --- a/example/docker/ubuntu2304/Dockerfile +++ b/example/docker/ubuntu2304/Dockerfile @@ -5,7 +5,7 @@ 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 && \ + 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 && \ diff --git a/example/docker/ubuntu2310/Dockerfile b/example/docker/ubuntu2310/Dockerfile index 953f9c7..baa3027 100644 --- a/example/docker/ubuntu2310/Dockerfile +++ b/example/docker/ubuntu2310/Dockerfile @@ -5,7 +5,7 @@ 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 && \ + 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 && \ diff --git a/example/package/cpprestsdk/cpprestsdk_debug.json b/example/package/cpprestsdk/cpprestsdk_debug.json index f2bbb51..9af053b 100644 --- a/example/package/cpprestsdk/cpprestsdk_debug.json +++ b/example/package/cpprestsdk/cpprestsdk_debug.json @@ -1,20 +1,22 @@ { - "Env": {}, - "DependsOn": [], + "Env": { }, + "DependsOn": [ "zlib", "boost" ], "Git": { - "URI": "git@github.com:microsoft/cpprestsdk.git", - "Revision": "v2.10.15" + "URI": "https://github.com/bringauto/cpprestsdk.git", + "Revision": "v2.10.20" }, "Build": { "CMake": { "Defines": { - "CMAKE_BUILD_TYPE": "Debug" + "CMAKE_BUILD_TYPE": "Debug", + "BUILD_TESTS": "OFF", + "BUILD_SAMPLES": "OFF" } } }, "Package": { "Name": "cpprestsdk", - "VersionTag": "v2.10.15", + "VersionTag": "v2.10.20", "PlatformString": { "Mode": "auto" }, diff --git a/example/package/cpprestsdk/cpprestsdk_release.json b/example/package/cpprestsdk/cpprestsdk_release.json index d2667bc..c43e8e3 100644 --- a/example/package/cpprestsdk/cpprestsdk_release.json +++ b/example/package/cpprestsdk/cpprestsdk_release.json @@ -1,20 +1,22 @@ { - "Env": {}, - "DependsOn": [], + "Env": { }, + "DependsOn": [ "zlib", "boost" ], "Git": { - "URI": "git@github.com:microsoft/cpprestsdk.git", - "Revision": "v2.10.15" + "URI": "https://github.com/bringauto/cpprestsdk.git", + "Revision": "v2.10.20" }, "Build": { "CMake": { "Defines": { - "CMAKE_BUILD_TYPE": "Release" + "CMAKE_BUILD_TYPE": "Release", + "BUILD_TESTS": "OFF", + "BUILD_SAMPLES": "OFF" } } }, "Package": { "Name": "cpprestsdk", - "VersionTag": "v2.10.15", + "VersionTag": "v2.10.20", "PlatformString": { "Mode": "auto" }, diff --git a/example/package/protozero/protozero_debug.json b/example/package/protozero/protozero_debug.json index a040f32..efecb02 100644 --- a/example/package/protozero/protozero_debug.json +++ b/example/package/protozero/protozero_debug.json @@ -28,7 +28,6 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2", "debian12", "ubuntu2304", "ubuntu2310" diff --git a/example/package/protozero/protozero_release.json b/example/package/protozero/protozero_release.json index 11cf8e7..5f6399f 100644 --- a/example/package/protozero/protozero_release.json +++ b/example/package/protozero/protozero_release.json @@ -28,7 +28,6 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2", "debian12", "ubuntu2304", "ubuntu2310" From 9e5d8664fecd3a7ff6cc927f650c4a634bb2a67e Mon Sep 17 00:00:00 2001 From: Josef Melkus Date: Wed, 27 Mar 2024 13:49:27 +0100 Subject: [PATCH 3/4] update fleet-http-client version --- .../fleet-http-client-shared/fleet_http_client_debug.json | 4 ++-- .../fleet-http-client-shared/fleet_http_client_release.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 7f9816b..c96123f 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 @@ -3,7 +3,7 @@ "DependsOn": [ "zlib", "ba-logger", "boost", "fleet-protocol-interface", "fleet-protocol-cpp", "cpprestsdk" ], "Git": { "URI": "https://github.com/bringauto/fleet-http-client.git", - "Revision": "v1.2.0" + "Revision": "v1.2.1" }, "Build": { "CMake": { @@ -19,7 +19,7 @@ }, "Package": { "Name": "fleet-http-client-shared", - "VersionTag": "v1.2.0", + "VersionTag": "v1.2.1", "PlatformString": { "Mode": "auto" }, 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 2a95e65..c0ec9c8 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 @@ -3,7 +3,7 @@ "DependsOn": [ "zlib", "ba-logger", "boost", "fleet-protocol-interface", "fleet-protocol-cpp", "cpprestsdk" ], "Git": { "URI": "https://github.com/bringauto/fleet-http-client.git", - "Revision": "v1.2.0" + "Revision": "v1.2.1" }, "Build": { "CMake": { @@ -19,7 +19,7 @@ }, "Package": { "Name": "fleet-http-client-shared", - "VersionTag": "v1.2.0", + "VersionTag": "v1.2.1", "PlatformString": { "Mode": "auto" }, From 183a3234f16dd1262e72b28fabda0336c07cf391 Mon Sep 17 00:00:00 2001 From: Josef Melkus Date: Tue, 2 Apr 2024 10:32:39 +0200 Subject: [PATCH 4/4] add fleet-os to protozero --- example/package/protozero/protozero_debug.json | 1 + example/package/protozero/protozero_release.json | 1 + 2 files changed, 2 insertions(+) diff --git a/example/package/protozero/protozero_debug.json b/example/package/protozero/protozero_debug.json index efecb02..a040f32 100644 --- a/example/package/protozero/protozero_debug.json +++ b/example/package/protozero/protozero_debug.json @@ -28,6 +28,7 @@ "ubuntu2204", "ubuntu2004", "debian11", + "fleet-os-2", "debian12", "ubuntu2304", "ubuntu2310" diff --git a/example/package/protozero/protozero_release.json b/example/package/protozero/protozero_release.json index 5f6399f..11cf8e7 100644 --- a/example/package/protozero/protozero_release.json +++ b/example/package/protozero/protozero_release.json @@ -28,6 +28,7 @@ "ubuntu2204", "ubuntu2004", "debian11", + "fleet-os-2", "debian12", "ubuntu2304", "ubuntu2310"