Merge pull request #14 from bringauto/BAF-763/fleet-protocol-package

fleet-protocol package, update ubuntu20.04 image
bringauto · Mar 4, 2024 · b689074 · b689074
2 parents 8b9c11c + 1128105
commit b689074
Show file tree

Hide file tree

Showing 6 changed files with 164 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,6 +10,6 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.21
       - name: Build
         run: ./build.sh
diff --git a/example/docker/ubuntu2004/Dockerfile b/example/docker/ubuntu2004/Dockerfile
@@ -5,9 +5,11 @@ 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 && \
+      build-essential cmake make libssl-dev coreutils lsb-release wget g++-10 gcc-10 && \
     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 && \

diff --git a/example/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json b/example/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json
@@ -0,0 +1,41 @@
+{
+  "Env": {},
+  "DependsOn": [
+    "fleet-protocol-interface"
+  ],
+  "Git": {
+    "URI": "https://github.com/bringauto/fleet-protocol-cpp.git",
+    "Revision": "v1.1.0"
+  },
+  "Build": {
+    "CMake": {
+      "Defines": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "BRINGAUTO_INSTALL": "ON",
+        "BRINGAUTO_PACKAGE": "ON",
+        "BRINGAUTO_SYSTEM_DEP": "ON",
+        "BRINGAUTO_TESTS" : "OFF"
+      }
+    }
+  },
+  "Package": {
+    "Name": "fleet-protocol-cxx-helpers-static",
+    "VersionTag": "v1.1.0",
+    "PlatformString": {
+      "Mode": "auto"
+    },
+    "IsLibrary": true,
+    "IsDevLib": true,
+    "IsDebug": true
+  },
+  "DockerMatrix": {
+    "ImageNames": [
+      "ubuntu2004",
+      "ubuntu2204",
+      "debian12",
+      "debian11",
+      "ubuntu2304",
+      "ubuntu2310"
+    ]
+  }
+}
diff --git a/example/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json b/example/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json
@@ -0,0 +1,41 @@
+{
+  "Env": {},
+  "DependsOn": [
+    "fleet-protocol-interface"
+  ],
+  "Git": {
+    "URI": "https://github.com/bringauto/fleet-protocol-cpp.git",
+    "VersionTag": "v1.1.0"
+  },
+  "Build": {
+    "CMake": {
+      "Defines": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "BRINGAUTO_INSTALL": "ON",
+        "BRINGAUTO_PACKAGE": "ON",
+        "BRINGAUTO_SYSTEM_DEP": "ON",
+        "BRINGAUTO_TESTS" : "OFF"
+      }
+    }
+  },
+  "Package": {
+    "Name": "fleet-protocol-cxx-helpers-static",
+    "VersionTag": "v1.1.0",
+    "PlatformString": {
+      "Mode": "auto"
+    },
+    "IsLibrary": true,
+    "IsDevLib": true,
+    "IsDebug": false
+  },
+  "DockerMatrix": {
+    "ImageNames": [
+      "ubuntu2004",
+      "ubuntu2204",
+      "debian12",
+      "debian11",
+      "ubuntu2304",
+      "ubuntu2310"
+    ]
+  }
+}
diff --git a/example/package/fleet-protocol-interface/fleet_protocol_debug.json b/example/package/fleet-protocol-interface/fleet_protocol_debug.json
@@ -0,0 +1,39 @@
+{
+  "Env": {},
+  "DependsOn": [],
+  "Git": {
+    "URI": "https://github.com/bringauto/fleet-protocol.git",
+    "Revision": "v2.0.0"
+  },
+  "Build": {
+    "CMake": {
+      "Defines": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "BRINGAUTO_INSTALL": "ON",
+        "BRINGAUTO_PACKAGE": "ON",
+        "BRINGAUTO_SYSTEM_DEP": "ON",
+        "BRINGAUTO_SAMPLES" : "OFF"
+      }
+    }
+  },
+  "Package": {
+    "Name": "fleet-protocol-interface",
+    "VersionTag": "v2.0.0",
+    "PlatformString": {
+      "Mode": "any_machine"
+    },
+    "IsLibrary": true,
+    "IsDevLib": true,
+    "IsDebug": true
+  },
+  "DockerMatrix": {
+    "ImageNames": [
+      "ubuntu2004",
+      "ubuntu2204",
+      "debian12",
+      "debian11",
+      "ubuntu2304",
+      "ubuntu2310"
+    ]
+  }
+}
diff --git a/example/package/fleet-protocol-interface/fleet_protocol_release.json b/example/package/fleet-protocol-interface/fleet_protocol_release.json
@@ -0,0 +1,39 @@
+{
+  "Env": {},
+  "DependsOn": [],
+  "Git": {
+    "URI": "https://github.com/bringauto/fleet-protocol.git",
+    "Revision": "v2.0.0"
+  },
+  "Build": {
+    "CMake": {
+      "Defines": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "BRINGAUTO_INSTALL": "ON",
+        "BRINGAUTO_PACKAGE": "ON",
+        "BRINGAUTO_SYSTEM_DEP": "ON",
+        "BRINGAUTO_SAMPLES" : "OFF"
+      }
+    }
+  },
+  "Package": {
+    "Name": "fleet-protocol-interface",
+    "VersionTag": "v2.0.0",
+    "PlatformString": {
+      "Mode": "any_machine"
+    },
+    "IsLibrary": true,
+    "IsDevLib": true,
+    "IsDebug": false
+  },
+  "DockerMatrix": {
+    "ImageNames": [
+      "ubuntu2004",
+      "ubuntu2204",
+      "debian12",
+      "debian11",
+      "ubuntu2304",
+      "ubuntu2310"
+    ]
+  }
+}