You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sz...@apache.org on 2022/08/25 15:35:46 UTC
[nifi-minifi-cpp] branch main updated (af4fef2c1 -> 13f2bd2b0)
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
from af4fef2c1 MINIFICPP-1918 - Windows test fix
new 462a7bc9c MINIFICPP-1915 Fix clang-tidy for newly created branch
new 8bb5e2a28 MINIFICPP-1921 Change test server ports residing in the default range
new 13f2bd2b0 MINIFICPP-1924 Upgrade ranges lib version and fetch source archive
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/ci.yml | 10 +++++++++-
cmake/RangeV3.cmake | 4 ++--
.../integration/TLSServerSocketSupportedProtocolsTest.cpp | 2 +-
libminifi/test/resources/TestGetTCPSecureEmptyPass.yml | 6 +++---
4 files changed, 15 insertions(+), 7 deletions(-)
[nifi-minifi-cpp] 01/03: MINIFICPP-1915 Fix clang-tidy for newly created branch
Posted by sz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 462a7bc9c2e0448b47b0ab0afe477a14e198f1bf
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Thu Aug 25 16:54:25 2022 +0200
MINIFICPP-1915 Fix clang-tidy for newly created branch
Closes #1398
Signed-off-by: Marton Szasz <sz...@apache.org>
---
.github/workflows/ci.yml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ffd79921f..ff1350d8b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -155,13 +155,21 @@ jobs:
run: cd build && make flake8
- id: files
uses: Ana06/get-changed-files@v2.1.0
+ continue-on-error: true
- name: clang-tidy
run: |
+ if [[ -n "${{ steps.files.outputs.all }}" ]]; then
+ FILES="${{ steps.files.outputs.all }}"
+ else
+ git fetch origin main && git checkout -b main origin/main || true
+ FILES=$(git diff --name-only main ${{ github.sha }} --)
+ git checkout ${{ github.sha }}
+ fi
# https://stackoverflow.com/questions/58466701/clang-tidy-cant-locate-stdlib-headers
sed -i -e 's/\/usr\/lib\/ccache\/clang++-14/\/lib\/llvm-14\/bin\/clang++/g' build/compile_commands.json
sed -i -e 's/\/usr\/lib\/ccache\/clang-14/\/lib\/llvm-14\/bin\/clang/g' build/compile_commands.json
- ./run_clang_tidy.sh "${{ steps.files.outputs.all }}"
+ ./run_clang_tidy.sh "${FILES}"
centos:
name: "centos"
runs-on: ubuntu-20.04
[nifi-minifi-cpp] 03/03: MINIFICPP-1924 Upgrade ranges lib version and fetch source archive
Posted by sz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 13f2bd2b02c20e4f036ad64f2add1f354ff8a095
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Thu Aug 25 16:57:16 2022 +0200
MINIFICPP-1924 Upgrade ranges lib version and fetch source archive
Upgrading to the latest release version of the range-v3 library
(v0.12.0) and using tar.gz archive to fetch source instead of fetching
the git repository as it was much slower and caused problems by hanging
and making CI jobs fail.
Closes #1407
Signed-off-by: Marton Szasz <sz...@apache.org>
---
cmake/RangeV3.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/RangeV3.cmake b/cmake/RangeV3.cmake
index 800ebcc33..6def37776 100644
--- a/cmake/RangeV3.cmake
+++ b/cmake/RangeV3.cmake
@@ -18,8 +18,8 @@
include(FetchContent)
FetchContent_Declare(range-v3_src
- GIT_REPOSITORY https://github.com/ericniebler/range-v3.git
- GIT_TAG 0487cca29e352e8f16bbd91fda38e76e39a0ed28
+ URL https://github.com/ericniebler/range-v3/archive/refs/tags/0.12.0.tar.gz
+ URL_HASH SHA256=015adb2300a98edfceaf0725beec3337f542af4915cec4d0b89fa0886f4ba9cb
)
FetchContent_MakeAvailable(range-v3_src)
[nifi-minifi-cpp] 02/03: MINIFICPP-1921 Change test server ports residing in the default range
Posted by sz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 8bb5e2a28dcbf048c185857270af6eea351f76a5
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Thu Aug 25 16:55:35 2022 +0200
MINIFICPP-1921 Change test server ports residing in the default range
Two of the socket tests randomly fails sometimes with the error message
`bind: Address already in use`: the SecureSocketGetTCPTestEmptyPass and
the TLSServerSocketSupportedProtocolsTest tests. One of these tests uses
the port 38776 and the other uses port 38778. The common issue with
these two ports is that both are in the default linux port range which
is between 32768 and 60999. If other tests are run beside these two
tests it is possible that the system assigns these two ports to the
clients in other tests, thus when we try to initialize the servers, the
port binding fails. We should change these two ports to be outside the
default system port range to avoid this issue.
Closes #1406
Signed-off-by: Marton Szasz <sz...@apache.org>
---
.../tests/integration/TLSServerSocketSupportedProtocolsTest.cpp | 2 +-
libminifi/test/resources/TestGetTCPSecureEmptyPass.yml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/extensions/standard-processors/tests/integration/TLSServerSocketSupportedProtocolsTest.cpp b/extensions/standard-processors/tests/integration/TLSServerSocketSupportedProtocolsTest.cpp
index 41b919798..2b782e727 100644
--- a/extensions/standard-processors/tests/integration/TLSServerSocketSupportedProtocolsTest.cpp
+++ b/extensions/standard-processors/tests/integration/TLSServerSocketSupportedProtocolsTest.cpp
@@ -235,7 +235,7 @@ class TLSServerSocketSupportedProtocolsTest {
protected:
void configureSecurity() {
host_ = minifi::io::Socket::getMyHostName();
- port_ = "38778";
+ port_ = "28978";
if (!key_dir_.empty()) {
configuration_->set(minifi::Configure::nifi_remote_input_secure, "true");
configuration_->set(minifi::Configure::nifi_security_client_certificate, key_dir_ + "cn.crt.pem");
diff --git a/libminifi/test/resources/TestGetTCPSecureEmptyPass.yml b/libminifi/test/resources/TestGetTCPSecureEmptyPass.yml
index 8d84c2cf8..f9dd9a0d6 100644
--- a/libminifi/test/resources/TestGetTCPSecureEmptyPass.yml
+++ b/libminifi/test/resources/TestGetTCPSecureEmptyPass.yml
@@ -32,7 +32,7 @@ Processors:
auto-terminated relationships list:
Properties:
SSL Context Service: SSLContextService
- endpoint-list: localhost:38776
+ endpoint-list: localhost:29776
end-of-message-byte: d
reconnect-interval: 100ms
connection-attempt-timeout: 2000
@@ -67,7 +67,7 @@ Connections:
source name: LogAttribute
source id: 2438e3c8-015a-1000-79ca-83af40ec1992
destination name: LogAttribute
- destination id: 2438e3c8-015a-1000-79ca-83af40ec1992
+ destination id: 2438e3c8-015a-1000-79ca-83af40ec1992
source relationship name: success
max work queue size: 0
max work queue data size: 1 MB
@@ -88,4 +88,4 @@ Controller Services:
- value: nifi-cert.pem
Remote Processing Groups:
-
+