Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add fedora40 dockerfile and to build matrix #27

Merged
merged 12 commits into from
Sep 26, 2024
Merged

add fedora40 dockerfile and to build matrix #27

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
08033bd
ubuntu 24.04; debian12 packages built by gcc13
MarioIvancik Sep 6, 2024
147a1ee
update version
MarioIvancik Sep 6, 2024
3af4228
shallow clone gcc
Melky-Phoe Sep 12, 2024
f1507c9
add fedora40 dockerfile and to build matrix
Melky-Phoe Sep 25, 2024
8c0a2a5
Merge remote-tracking branch 'refs/remotes/origin/ubuntu24_packages' …
Melky-Phoe Sep 25, 2024
1ec9974
update versions, add fedora40
Melky-Phoe Sep 25, 2024
72c95cc
resolve MR comments
Melky-Phoe Sep 25, 2024
496a3ca
sonarcloud refactor
Melky-Phoe Sep 25, 2024
6cc84a5
Revert "sonarcloud refactor"
Melky-Phoe Sep 25, 2024
b4a16f5
revert
Melky-Phoe Sep 25, 2024
6845253
fix format
Melky-Phoe Sep 25, 2024
7f54f91
clean
Melky-Phoe Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/add_docker_to_matrix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
shopt -s nullglob
for package_json in $(find . -name '*.json')
do
jq '.DockerMatrix.ImageNames += [ "ubuntu2310" ]' ${package_json} > ${package_json}.test
jq '.DockerMatrix.ImageNames += [ "fedora40" ]' ${package_json} > ${package_json}.test
mv ${package_json}.test ${package_json}
done
shopt -u nullglob
27 changes: 27 additions & 0 deletions example/docker/fedora40/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
FROM fedora:40

USER root
RUN echo root:1234 | chpasswd

RUN dnf -y update && \
dnf -y install \
make automake gcc gcc-c++ kernel-devel binutils lsb-release git openssl-devel openssh-server wget patchelf

RUN wget "https://github.com/Kitware/CMake/releases/download/v3.30.3/cmake-3.30.3-linux-x86_64.sh" -O cmake.sh && \
chmod +x cmake.sh && \
./cmake.sh --skip-license --prefix=/usr/local && \
rm ./cmake.sh

RUN dnf -y update && \
dnf -y remove \
wget

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

RUN ssh-keygen -A

ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]
3 changes: 2 additions & 1 deletion example/package/ba-logger/ba-logger_debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"ubuntu2204",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/ba-logger/ba-logger_release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"ubuntu2204",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/boost/boost_debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"debian11",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/boost/boost_release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"debian11",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/bzip2/bzip2_debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"ubuntu2204",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/bzip2/bzip2_release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"ubuntu2204",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
10 changes: 7 additions & 3 deletions example/package/cpprestsdk/cpprestsdk_debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"Env": { },
"DependsOn": [ "zlib", "boost" ],
"Env": {},
"DependsOn": [
"zlib",
"boost"
],
"Git": {
"URI": "https://github.com/bringauto/cpprestsdk.git",
"Revision": "v2.10.20"
Expand Down Expand Up @@ -31,7 +34,8 @@
"debian12",
"debian11",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
10 changes: 7 additions & 3 deletions example/package/cpprestsdk/cpprestsdk_release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"Env": { },
"DependsOn": [ "zlib", "boost" ],
"Env": {},
"DependsOn": [
"zlib",
"boost"
],
"Git": {
"URI": "https://github.com/bringauto/cpprestsdk.git",
"Revision": "v2.10.20"
Expand Down Expand Up @@ -31,7 +34,8 @@
"debian12",
"debian11",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/curl/curl_debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"fleet-os-2",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/curl/curl_release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"fleet-os-2",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/cxxopts/cxxopts_v3_debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"fleet-os-2",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/cxxopts/cxxopts_v3_release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"fleet-os-2",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/expat/expat_debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"fleet-os-2",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/expat/expat_release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"fleet-os-2",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
16 changes: 12 additions & 4 deletions example/package/fleet-http-client-shared/fleet_http_client_debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{
"Env": {},
"DependsOn": [ "zlib", "ba-logger", "boost", "fleet-protocol-interface", "fleet-protocol-cxx-helpers-static", "cpprestsdk" ],
"DependsOn": [
"zlib",
"ba-logger",
"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"
Expand All @@ -12,8 +19,8 @@
"BRINGAUTO_INSTALL": "ON",
"BRINGAUTO_PACKAGE": "ON",
"BRINGAUTO_SYSTEM_DEP": "ON",
"BRINGAUTO_SAMPLES" : "OFF",
"BRINGAUTO_TESTS" : "OFF"
"BRINGAUTO_SAMPLES": "OFF",
"BRINGAUTO_TESTS": "OFF"
}
}
},
Expand All @@ -34,7 +41,8 @@
"debian12",
"debian11",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
16 changes: 12 additions & 4 deletions example/package/fleet-http-client-shared/fleet_http_client_release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{
"Env": {},
"DependsOn": [ "zlib", "ba-logger", "boost", "fleet-protocol-interface", "fleet-protocol-cxx-helpers-static", "cpprestsdk" ],
"DependsOn": [
"zlib",
"ba-logger",
"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"
Expand All @@ -12,8 +19,8 @@
"BRINGAUTO_INSTALL": "ON",
"BRINGAUTO_PACKAGE": "ON",
"BRINGAUTO_SYSTEM_DEP": "ON",
"BRINGAUTO_SAMPLES" : "OFF",
"BRINGAUTO_TESTS" : "OFF"
"BRINGAUTO_SAMPLES": "OFF",
"BRINGAUTO_TESTS": "OFF"
}
}
},
Expand All @@ -34,7 +41,8 @@
"debian12",
"debian11",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
5 changes: 3 additions & 2 deletions example/package/fleet-protocol-cpp/fleet_protocol_cpp_debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"BRINGAUTO_INSTALL": "ON",
"BRINGAUTO_PACKAGE": "ON",
"BRINGAUTO_SYSTEM_DEP": "ON",
"BRINGAUTO_TESTS" : "OFF"
"BRINGAUTO_TESTS": "OFF"
}
}
},
Expand All @@ -35,7 +35,8 @@
"debian12",
"debian11",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
5 changes: 3 additions & 2 deletions example/package/fleet-protocol-cpp/fleet_protocol_cpp_release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"BRINGAUTO_INSTALL": "ON",
"BRINGAUTO_PACKAGE": "ON",
"BRINGAUTO_SYSTEM_DEP": "ON",
"BRINGAUTO_TESTS" : "OFF"
"BRINGAUTO_TESTS": "OFF"
}
}
},
Expand All @@ -35,7 +35,8 @@
"debian12",
"debian11",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
5 changes: 3 additions & 2 deletions example/package/fleet-protocol-interface/fleet_protocol_debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"BRINGAUTO_INSTALL": "ON",
"BRINGAUTO_PACKAGE": "ON",
"BRINGAUTO_SYSTEM_DEP": "ON",
"BRINGAUTO_SAMPLES" : "OFF"
"BRINGAUTO_SAMPLES": "OFF"
}
}
},
Expand All @@ -34,7 +34,8 @@
"debian11",
"ubuntu2304",
"ubuntu2310",
"ubuntu1804-aarch64"
"ubuntu1804-aarch64",
"fedora40"
]
}
}
5 changes: 3 additions & 2 deletions example/package/fleet-protocol-interface/fleet_protocol_release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"BRINGAUTO_INSTALL": "ON",
"BRINGAUTO_PACKAGE": "ON",
"BRINGAUTO_SYSTEM_DEP": "ON",
"BRINGAUTO_SAMPLES" : "OFF"
"BRINGAUTO_SAMPLES": "OFF"
}
}
},
Expand All @@ -34,7 +34,8 @@
"debian11",
"ubuntu2304",
"ubuntu2310",
"ubuntu1804-aarch64"
"ubuntu1804-aarch64",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/fleet-protocol-internal-client/internal_client_debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"debian11",
"ubuntu2304",
"ubuntu2310",
"ubuntu1804-aarch64"
"ubuntu1804-aarch64",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/fleet-protocol-internal-client/internal_client_release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"debian11",
"ubuntu2304",
"ubuntu2310",
"ubuntu1804-aarch64"
"ubuntu1804-aarch64",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/gtest/gtest_debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"fleet-os-2",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/gtest/gtest_release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"fleet-os-2",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
3 changes: 2 additions & 1 deletion example/package/libosmium/libosmium_debug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"ubuntu2204",
"debian12",
"ubuntu2304",
"ubuntu2310"
"ubuntu2310",
"fedora40"
]
}
}
Loading
Loading