Skip to content

Commit b6c383d

Browse files
cwlaceweRagaadmichaelbeale-ILkeirafadamssys-vdms
authored
Release v2.12.0 (#317)
Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> Co-authored-by: Rohit Verma <rohit1.verma@intel.com> Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Co-authored-by: Chaunte W. Lacewell <chaunte.w.lacewell@intel.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Updates for release (#279) * Updates for release Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Update setup script Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Update coverage from Orchestration PR Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> --------- Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Replace non-inclusive terminology (#284) * Update doxyfile comment, change name of main node detail to ControlPlaneNodeDetail Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Updated references of `master` node to `primary` or `control plane` Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * disable to deactivate excluding external references Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * dummy to placeholder Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * kill to stop excluding commands Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Automated coverage update --------- Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Neo4j configurable number of clients connection (#287) * Update Neo4j query handler to make number of client connections configurable Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Update config keyword to `neo4j_conn_pool_sz` Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Automated coverage update * Automated coverage update --------- Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Chaunte W. Lacewell <chaunte.w.lacewell@intel.com> * Bump flask from 3.1.0 to 3.1.1 in /.github (#288) Bumps [flask](https://github.com/pallets/flask) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](pallets/flask@3.1.0...3.1.1) --- updated-dependencies: - dependency-name: flask dependency-version: 3.1.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Improve documentation (#286) * Transfer wiki to mkdocs Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Add doc deploy to workflow Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Change trigger of update docs to push Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Remove doc artifact Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * TESTING ONLY: Add push to branch as trigger Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * mod update doc workflow, add dark/light mode to mkdocs.yml Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Automated coverage update * Change theme to readthedocs and add DeepWiki links Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Automated coverage update * Organize mkdocs and add req file Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Fix workflow Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Automated coverage update * Update guides Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Rename guide section Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Format updates 1 and re-structure files Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Format update Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Pull latest wiki updates Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Change references to wiki to site https://intellabs.github.io/vdms/; remove INSTALL.md and use version in docs/ Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Cleanup; Update trigger for pushes to develop and master Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> * Automated coverage update * Automated coverage update * Spelling fixes and add conditional statement to job pushing documentation (added test trigger for branch) Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * fix workflow condition Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * fix workflow command Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * fix workflow command Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * fix workflow command Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * fix workflow command Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * fix workflow command Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * remove test text Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Remove test trigger Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Remove collections reference Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Removed *_index.md pages under commands to allow easier navigation with next and prev buttons: Fix incorrect link to Kubernetes guide Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Automated coverage update --------- Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * S3 Connection Logging: Copy-Paste errors (#290) * Update S3 connection error logs Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Minor updates to error logs Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Automated coverage update --------- Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Integrating shared connection logic for PMGD * Automated coverage update * Automated coverage update * initial implementation of filter library API and memory management for filters (#292) * initial implementation of filter library API and memory management for filters * refactor intial implementation into classes and derived classes * [pre-commit.ci lite] apply automatic fixes * Implement add functionality for filter with Cuckoo path logic and displacement * [pre-commit.ci lite] apply automatic fixes * complete Filter implementation * [pre-commit.ci lite] apply automatic fixes * add unit tests * [pre-commit.ci lite] apply automatic fixes * adding more unit tests * [pre-commit.ci lite] apply automatic fixes * make signature longer for collisions and increase coverage for tests * [pre-commit.ci lite] apply automatic fixes * Automated coverage update --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Chaunte W. Lacewell <chaunte.w.lacewell@intel.com> * add test cases for collection manager (#304) * add test cases for collection manager * [pre-commit.ci lite] apply automatic fixes * Automated coverage update --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * 297 transaction succeeds despite exception (#302) * Include query operation failure tests Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Check for query errors while performing operations Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Check for query errors while performing Video operations Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Update Image and Video tests to expect exception on invalid operations Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Automated coverage update --------- Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * 295 addget fast filters integration (#305) * Add and find filter stubs * filter stubs updating * Initial add filter implentation completed, WiP * Fixed missing defintion in filter.h, initial compilation of add get and list complete for filters. Moving to testing... * Tests, WiP, currently working, but need more cases * Basic test integration * [pre-commit.ci lite] apply automatic fixes * Additional test, removal of debug output * Fixing merge issue in cmakelist, test tweak addition, reduce noisiness slightly * Automated coverage update * Automated coverage update * Update include/vcl/Filter.h Co-authored-by: Chaunte W. Lacewell <chaunte.w.lacewell@intel.com> * Automated coverage update --------- Co-authored-by: kfadams <kfadams@evs-infra.jf.intel.com> Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Chaunte W. Lacewell <chaunte.w.lacewell@intel.com> * Create intel_security_scan.yaml * 196 objects not cleaned up on transaction failure (#306) * Include S3 transaction rollback test This test counts the number of objects stored in S3, then executes a query that would cause a storage leak and finally makes sure the number of objects stored in S3 is still the same. Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Implement S3 transaction rollback for PMGD handler In case of failure, the exception handler will make sure all added objects within the current query context are removed from S3. Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Implement S3 transaction rollback for Neo4j handler In case of failure, all added objects within the current query context are removed from S3. Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Automated coverage update --------- Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * 182 erroneous read only on server start (#308) * Update ImageTransactionRollback test and include new test FindImageEmptyDB This test runs a query with 2 FindImage commands on a new/empty PMGD db instance and validates the response contains the excepted message `"No entities found"`. Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Update QueryNode and QueryEdge protobuf construct handler read mode to avoid internal PMGD validation check exception A read-write validation check is performed internally by PMGD. When running a query node/edge transaction with a readOnly flag a validation check will trigger an exception. The exception message will be propagated to the query response. This change allows the validation to pass while technically the transaction is still a readOnly operation. The validation occurs in the PMGD codebase, updating it is not reasonable at this time. Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Restore previous test changes Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> --------- Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> * Adding CPP CodeQL Scanning (#309) * Add files via upload * [pre-commit.ci lite] apply automatic fixes --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> * Override coverage (#310) * Change coverage reports to PR #308; Set gcovr to version of prev. scans; Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Upgrade gcovr (Changes coverage results) Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Update expected coverage Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> --------- Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Bump protobuf from 4.24.2 to 4.25.8 in /client/python (#299) * Bump protobuf from 4.24.2 to 4.25.8 in /client/python Bumps [protobuf](https://github.com/protocolbuffers/protobuf) from 4.24.2 to 4.25.8. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](protocolbuffers/protobuf@v4.24.2...v4.25.8) --- updated-dependencies: - dependency-name: protobuf dependency-version: 4.25.8 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Upgrade protobuf every else in code Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Automated coverage update --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Convert CodeQL Scan from Basic to Advanced (#311) * Update codeql_analysis.yml * [pre-commit.ci lite] apply automatic fixes * Automated coverage update --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Upgrade protobuf to 5.29.5 (#312) * Upgrade protobuf to 5.29.5 Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Change google test version (compatibility issue with v1.17.0) Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * downgrade google test version to v1.13.0 for neo4j Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Revert to googletest commit 4c9a3bb62bf3ba1f1010bf96f9c8ed767b363774 Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Automated coverage update * Update googletest version to one used in protobuf v29.5 Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Automated coverage update --------- Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Release requirements (#315) * Update requirements.txt Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Update actions to latest versions Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Automated coverage update * Update UDF requirements.txt Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> * Automated coverage update --------- Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update codeql_analysis.yml (#318) * Update codeql_analysis.yml Removing security and quality query from CodeQL to reduce the noise in the findings. * Automated coverage update --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: cwlacewe <chaunte.w.lacewell@intel.com> Signed-off-by: Lacewell, Chaunte W <chaunte.w.lacewell@intel.com> Signed-off-by: Steven Rojas <steven.rojas.cubero@intel.com> Co-authored-by: Ragaad <ragaad.altarawneh@intel.com> Co-authored-by: Michael Beale <michael.beale@intel.com> Co-authored-by: Ian Adams <ian.f.adams@intel.com> Co-authored-by: sys_vdms <sys_vdms@intel.com> Co-authored-by: Rohit Verma <rohit1.verma@intel.com> Co-authored-by: Sameh Gobriel <75963591+s-gobriel@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stewart Blacklock <stewart.f.blacklock@intel.com> Co-authored-by: Rohit Verma <61152664+rv355@users.noreply.github.com> Co-authored-by: s-gobriel <sameh.gobriel@intel.com> Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: rolandoquesada <97552286+rolandoquesada@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: Rolando Quesada <rolando.quesada.jimenez@intel.com> Co-authored-by: 100rish <sourish.chatterjee@intel.com> Co-authored-by: StevenRojasC <72471602+StevenRojasC@users.noreply.github.com> Co-authored-by: kfadams <kfadams@evs-infra.jf.intel.com>
1 parent 90721ba commit b6c383d

File tree

163 files changed

+12116
-397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+12116
-397
lines changed

.github/coverage/cpp.develop.coverage_report.txt

Lines changed: 23 additions & 17 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
68.9262
1+
68.105

.github/doc-requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
mkdocs
2+
mkdocs-material
3+
pymdown-extensions

.github/requirements.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
blinker==1.9.0
2-
cffi==1.17.1
3-
click==8.1.8
4-
colorlog==6.9.0
5-
coverage==7.8.0
6-
cryptography==44.0.2
7-
Flask==3.1.0
8-
gcovr==8.3
2+
cffi==2.0.0
3+
click==8.3.0
4+
colorlog==6.10.1
5+
coverage==7.11.0
6+
cryptography==46.0.3
7+
Flask==3.1.2
8+
gcovr==8.4
99
imutils==0.5.4
1010
itsdangerous==2.2.0
1111
Jinja2==3.1.6
12-
lxml==5.3.2
13-
MarkupSafe==3.0.2
12+
lxml==6.0.2
13+
MarkupSafe==3.0.3
1414
numpy==1.26.4
1515
opencv-python-headless==4.11.0.86
16-
pillow==11.1.0
17-
protobuf==4.24.2
18-
pycparser==2.22
19-
Pygments==2.19.1
20-
pyzmq==26.4.0
21-
scipy==1.15.2
16+
pillow==12.0.0
17+
protobuf==5.29.5
18+
pycparser==2.23
19+
Pygments==2.19.2
20+
pyzmq==27.1.0
21+
scipy==1.16.2
2222
sk-video==1.1.10
2323
Werkzeug==3.1.3
2424
zmq==0.0.0

.github/scripts/Dockerfile.checkin

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ENV DEBIAN_FRONTEND=noninteractive
2121
ENV DEBCONF_NOWARNINGS="yes"
2222
ENV PYTHON_BASE="3.12"
2323
ENV PYTHON_VERSION="${PYTHON_BASE}.3"
24-
ENV PROTOBUF_VERSION="24.2"
24+
ENV PROTOBUF_VERSION="29.5"
2525
ENV NUMPY_MIN_VERSION="1.26.0"
2626
ENV VIRTUAL_ENV=/opt/venv
2727

@@ -77,6 +77,7 @@ ENV AUTOCONF_VERSION="2.71" \
7777
AWS_SDK_VERSION="1.11.336" \
7878
CMAKE_VERSION="v3.28.5" \
7979
FAISS_VERSION="v1.9.0" \
80+
GOOGLETEST_VERSION="4c9a3bb62bf3ba1f1010bf96f9c8ed767b363774" \
8081
LIBEDIT_VERSION="20230828-3.1" \
8182
OPENCV_VERSION="4.9.0" \
8283
PEG_VERSION="0.1.19" \
@@ -89,27 +90,25 @@ RUN git clone --branch ${CMAKE_VERSION} https://github.com/Kitware/CMake.git /de
8990
cd /dependencies/CMake && ./bootstrap && make ${BUILD_THREADS} && \
9091
make install DESTDIR=/opt/dist && make install
9192

93+
# GOOGLETEST
94+
# hadolint ignore=DL3003,SC2086
95+
RUN git clone https://github.com/google/googletest.git /dependencies/googletest && \
96+
cd /dependencies/googletest && git checkout "${GOOGLETEST_VERSION}" && \
97+
mkdir build && cd build/ && \
98+
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
99+
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
100+
-DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 .. && \
101+
make ${BUILD_THREADS} && make install
102+
92103
# PROTOBUF & ITS DEPENDENCIES
93104
# hadolint ignore=DL3003,SC2086
94105
RUN git clone -b "v${PROTOBUF_VERSION}" --recurse-submodules https://github.com/protocolbuffers/protobuf.git /dependencies/protobuf && \
95-
cd /dependencies/protobuf/third_party/googletest && mkdir build && cd build/ && \
96-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
97-
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
98-
-DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 .. && \
99-
make ${BUILD_THREADS} && make install && \
100-
cd /dependencies/protobuf/third_party/abseil-cpp && mkdir build && cd build && \
101-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON \
102-
-DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local -DABSL_BUILD_TESTING=ON \
103-
-DABSL_USE_EXTERNAL_GOOGLETEST=ON \
104-
-DABSL_FIND_GOOGLETEST=ON -DCMAKE_CXX_STANDARD=17 .. && \
105-
make ${BUILD_THREADS} && make install && ldconfig /opt/dist/usr/local/lib && \
106106
cd /dependencies/protobuf && \
107-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
108-
-DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
109-
-Dprotobuf_ABSL_PROVIDER=package \
110-
-Dprotobuf_BUILD_TESTS=ON \
111-
-Dabsl_DIR=/opt/dist/usr/local/lib/cmake/absl . && \
112-
make ${BUILD_THREADS} && make install
107+
cmake -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON \
108+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/opt/dist/usr/local \
109+
-DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
110+
-Dprotobuf_BUILD_TESTS=ON . && \
111+
make ${BUILD_THREADS} && make install
113112

114113
# OPENCV
115114
# hadolint ignore=DL3003,SC2086
@@ -150,8 +149,8 @@ RUN curl -L -O https://github.com/TileDB-Inc/TileDB/archive/refs/tags/${TILEDB_V
150149

151150
# AUTOCONF VERSION FOR NEO4J
152151
# hadolint ignore=DL3003,SC2086
153-
RUN curl -O https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.xz && \
154-
tar -xf autoconf-${AUTOCONF_VERSION}.tar.xz && cd autoconf-${AUTOCONF_VERSION} && \
152+
RUN curl -L -O http://ftpmirror.gnu.org/autoconf/autoconf-${AUTOCONF_VERSION}.tar.gz && \
153+
tar -xzf autoconf-${AUTOCONF_VERSION}.tar.gz && cd autoconf-${AUTOCONF_VERSION} && \
155154
./configure && make ${BUILD_THREADS} && make install DESTDIR=/opt/dist && make install
156155

157156
# LIB-OMNI FOR NEO4J QUERY HANDLER
@@ -253,7 +252,7 @@ RUN apt-get update -y && apt-get upgrade -y && \
253252
apt-get --purge remove -y python3.11 && apt-get autoremove -y && \
254253
apt-get clean && rm -rf /var/lib/apt/lists/* && \
255254
echo "/usr/local/lib" >> /etc/ld.so.conf.d/all-libs.conf && ldconfig && \
256-
python3 -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "protobuf==4.${PROTOBUF_VERSION}" \
255+
python3 -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "protobuf==5.${PROTOBUF_VERSION}" \
257256
"coverage>=7.3.1" "cryptography>=44.0.1"
258257

259258
# COVERAGE TESTING
@@ -264,7 +263,7 @@ RUN if [ "${BUILD_COVERAGE}" = "ON" ]; then \
264263
apt-get install -y --no-install-suggests --no-install-recommends gdb ; \
265264
apt-get clean ; \
266265
rm -rf /var/lib/apt/lists/* ; \
267-
python3 -m pip install --no-cache-dir "gcovr>=7.0" ; \
266+
python3 -m pip install --no-cache-dir "gcovr==8.4" ; \
268267
curl -L -o /vdms/minio https://dl.min.io/server/minio/release/linux-amd64/minio ; \
269268
chmod +x /vdms/minio ; \
270269
mkdir -p /vdms/minio_files/minio-bucket ; \

.github/scripts/setup_vdms.sh

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ export PATH="$VIRTUAL_ENV/bin:$PATH"
176176
177177
if [ "${BUILD_COVERAGE}" = "ON" ]; then
178178
apt-get install -y --no-install-suggests --no-install-recommends gdb
179-
python -m pip install --no-cache-dir "gcovr>=7.0"
179+
python -m pip install --no-cache-dir "gcovr==8.4"
180180
curl -L -o ${WORKSPACE}/minio https://dl.min.io/server/minio/release/linux-amd64/minio
181181
chmod +x ${WORKSPACE}/minio
182182
mkdir -p ${WORKSPACE}/minio_files/minio-bucket
@@ -194,11 +194,12 @@ AUTOCONF_VERSION="2.71"
194194
AWS_SDK_VERSION="1.11.336"
195195
CMAKE_VERSION="v3.28.5"
196196
FAISS_VERSION="v1.9.0"
197+
GOOGLETEST_VERSION="4c9a3bb62bf3ba1f1010bf96f9c8ed767b363774"
197198
LIBEDIT_VERSION="20230828-3.1"
198199
NUMPY_MIN_VERSION="1.26.0"
199200
OPENCV_VERSION="4.9.0"
200201
PEG_VERSION="0.1.19"
201-
PROTOBUF_VERSION="24.2"
202+
PROTOBUF_VERSION="29.5"
202203
TILEDB_VERSION="2.14.1"
203204
VALIJSON_VERSION="v0.6"
204205
@@ -213,32 +214,25 @@ make ${BUILD_THREADS}
213214
make install
214215
215216
216-
# INSTALL PROTOBUF & ITS DEPENDENCIES
217-
git clone -b "v${PROTOBUF_VERSION}" --recurse-submodules https://github.com/protocolbuffers/protobuf.git $VDMS_DEP_DIR/protobuf
218-
cd $VDMS_DEP_DIR/protobuf/third_party/googletest
217+
# GOOGLETEST
218+
git clone https://github.com/google/googletest.git $VDMS_DEP_DIR/googletest
219+
cd $VDMS_DEP_DIR/googletest
220+
git checkout "${GOOGLETEST_VERSION}"
219221
mkdir build && cd build/
220222
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release \
221223
-DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
222224
-DBUILD_GMOCK=ON -DCMAKE_CXX_STANDARD=17 ..
223225
make ${BUILD_THREADS}
224226
make install
225227
226-
cd $VDMS_DEP_DIR/protobuf/third_party/abseil-cpp
227-
mkdir build && cd build
228-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON \
229-
-DCMAKE_INSTALL_PREFIX=/usr/local -DABSL_BUILD_TESTING=ON \
230-
-DABSL_USE_EXTERNAL_GOOGLETEST=ON \
231-
-DABSL_FIND_GOOGLETEST=ON -DCMAKE_CXX_STANDARD=17 ..
232-
make ${BUILD_THREADS}
233-
make install
234-
ldconfig /usr/local/lib
235228
229+
# INSTALL PROTOBUF & ITS DEPENDENCIES
230+
git clone -b "v${PROTOBUF_VERSION}" --recurse-submodules https://github.com/protocolbuffers/protobuf.git $VDMS_DEP_DIR/protobuf
236231
cd $VDMS_DEP_DIR/protobuf
237-
cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
232+
cmake -Dprotobuf_FORCE_FETCH_DEPENDENCIES=ON \
233+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr/local \
238234
-DCMAKE_CXX_STANDARD=17 -Dprotobuf_BUILD_SHARED_LIBS=ON \
239-
-Dprotobuf_ABSL_PROVIDER=package \
240-
-Dprotobuf_BUILD_TESTS=ON \
241-
-Dabsl_DIR=/usr/local/lib/cmake/absl .
235+
-Dprotobuf_BUILD_TESTS=ON .
242236
make ${BUILD_THREADS}
243237
make install
244238
@@ -255,7 +249,7 @@ make install
255249
256250
# INSTALL PYTHON PACKAGES
257251
python -m pip install --no-cache-dir "numpy>=${NUMPY_MIN_VERSION},<2.0.0" "coverage>=7.3.1" \
258-
"protobuf==4.${PROTOBUF_VERSION}" "cryptography>=44.0.1"
252+
"protobuf==5.${PROTOBUF_VERSION}" "cryptography>=44.0.1"
259253
260254
261255
# INSTALL VALIJSON

.github/workflows/CI.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ jobs:
7171
permissions:
7272
contents: write
7373
pull-requests: write
74-
# name: Lint & Update Reports
7574
needs: [Testing, Results]
7675
uses: ./.github/workflows/_CI_update.yml
7776
with:

.github/workflows/Update_docs.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Update Docs
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
12+
permissions: {}
13+
jobs:
14+
check_files:
15+
runs-on: ubuntu-latest
16+
outputs:
17+
docs_changed: ${{ steps.check_changed_files.outputs.docs_changed }}
18+
steps:
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
20+
with:
21+
fetch-depth: 0
22+
- id: check_changed_files
23+
run: |
24+
# Diff HEAD
25+
diff=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }})
26+
27+
# Check for changes in docs/
28+
docs_changed=false
29+
for FILE in $diff; do
30+
if [[ "$FILE" == docs/* ]]; then
31+
docs_changed=true
32+
fi
33+
done
34+
35+
# Set output
36+
echo "docs_changed=$docs_changed" >> $GITHUB_OUTPUT
37+
38+
39+
# Run job only if changes occurred in docs/
40+
deploy:
41+
permissions:
42+
contents: write
43+
issues: write
44+
pull-requests: write
45+
runs-on: ubuntu-latest
46+
needs: [ check_files ]
47+
if: needs.check_files.outputs.docs_changed == 'true'
48+
steps:
49+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
50+
- name: Configure Git Credentials
51+
run: |
52+
git config user.name github-actions[bot]
53+
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
54+
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
55+
with:
56+
python-version: 3.x
57+
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
58+
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
59+
with:
60+
key: mkdocs-${{ env.cache_id }}
61+
path: .cache
62+
restore-keys: |
63+
mkdocs-
64+
- run: pip install -r .github/doc-requirements.txt
65+
- run: mkdocs gh-deploy --force

.github/workflows/_CI_coverage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
target_cpp_value: ${{ steps.target_values.outputs.cpp }}
7474
target_py_value: ${{ steps.target_values.outputs.py }}
7575
steps:
76-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
76+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
7777
with:
7878
ref: ${{ env.TARGET_BRANCH_REF }}
7979
fetch-depth: 0
@@ -105,7 +105,7 @@ jobs:
105105
coverage_value_updated: ${{ steps.report_coverage.outputs.cov_changed }}
106106
coverage_test_status: ${{ steps.report_coverage.outputs.coverage_test_status }}
107107
steps:
108-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.1.7
108+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
109109
with:
110110
submodules: true
111111

@@ -335,7 +335,7 @@ jobs:
335335
echo "coverage_test_status=${test_status}" >> $GITHUB_OUTPUT
336336
337337
- name: Upload New coverage results
338-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
338+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
339339
with:
340340
name: coverage_artifact
341341
path: .github/coverage/*.new.*.txt

.github/workflows/_CI_coverage_compare.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
pull-requests: write
3333
steps:
3434
- name: Comment Coverage
35-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
35+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
3636
with:
3737
script: |
3838
github.rest.issues.createComment({

0 commit comments

Comments
 (0)