diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bf285cf49..4b65bf94c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: run: | # Set core file size limit to unlimited ulimit -c unlimited - ctest -j4 --output-on-failure --timeout 300 + ctest --timeout 300 -j4 --output-on-failure --timeout 300 working-directory: build - name: linter run: ninja linter @@ -310,7 +310,7 @@ jobs: run: | # Set core file size limit to unlimited ulimit -c unlimited - ctest -j$(nproc) --output-on-failure + ctest --timeout 300 -j$(nproc) --output-on-failure working-directory: build - name: check-cores if: ${{ failure() && steps.test.conclusion == 'failure' }} @@ -429,7 +429,7 @@ jobs: run: | # Set core file size limit to unlimited ulimit -c unlimited - ctest -j$(nproc) --output-on-failure + ctest --timeout 300 -j$(nproc) --output-on-failure working-directory: build - name: linter run: cmake --build . --target linter diff --git a/extensions/standard-processors/modbus/ReadModbusFunctions.cpp b/extensions/standard-processors/modbus/ReadModbusFunctions.cpp index 442d31ec55..6ade0dcf3c 100644 --- a/extensions/standard-processors/modbus/ReadModbusFunctions.cpp +++ b/extensions/standard-processors/modbus/ReadModbusFunctions.cpp @@ -22,8 +22,6 @@ namespace org::apache::nifi::minifi::modbus { -ReadModbusFunction::~ReadModbusFunction() = default; - std::vector ReadModbusFunction::requestBytes() const { constexpr std::array modbus_service_protocol_identifier = {std::byte{0}, std::byte{0}}; const auto pdu = rawPdu(); diff --git a/extensions/standard-processors/modbus/ReadModbusFunctions.h b/extensions/standard-processors/modbus/ReadModbusFunctions.h index fa51efd790..cf6be30616 100644 --- a/extensions/standard-processors/modbus/ReadModbusFunctions.h +++ b/extensions/standard-processors/modbus/ReadModbusFunctions.h @@ -48,7 +48,7 @@ class ReadModbusFunction { virtual bool operator==(const ReadModbusFunction&) const = 0; - virtual ~ReadModbusFunction(); + virtual ~ReadModbusFunction() = default; [[nodiscard]] std::vector requestBytes() const;