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 2023/10/24 16:10:10 UTC
[nifi-minifi-cpp] branch main updated (290dd8a4f -> 0276dab71)
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 290dd8a4f MINIFICPP-2186 Remove workarounds no longer needed in Visual Studio 2022
new 88c0dd253 MINIFICPP-2253 Remove conflicting Strawberry Perl tool executables
new 874496efc MINIFICPP-2254 Fix template error in VS2022 build
new 4dc44c7ea MINIFICPP-1712 Wait for SQL ODBC driver install to finish in CI
new 0276dab71 MINIFICPP-2257 update windows sqliteodbc hash to v0.99991
The 4 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 | 9 +++++++--
libminifi/include/core/logging/Logger.h | 4 ++--
2 files changed, 9 insertions(+), 4 deletions(-)
[nifi-minifi-cpp] 01/04: MINIFICPP-2253 Remove conflicting Strawberry Perl tool executables
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 88c0dd253480f5326908b2516de3a38edcaf6053
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Tue Oct 24 13:02:49 2023 +0200
MINIFICPP-2253 Remove conflicting Strawberry Perl tool executables
Closes #1686
Signed-off-by: Marton Szasz <sz...@apache.org>
---
.github/workflows/ci.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7fd5007a0..554827371 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,6 +103,11 @@ jobs:
if ((Get-FileHash 'sqliteodbc_w64.exe').Hash -ne "0df79be4a4412542839ebf405b20d95a7dfc803da0b0b6b0dc653d30dc82ee84") {Write "Hash mismatch"; Exit 1}
./sqliteodbc_w64.exe /S
shell: powershell
+ - id: remove-strawberry-perl-tool-executables
+ run: |
+ # Remove conflicting Strawberry Perl executables like patch.exe and cmcldeps.exe (More information in the note under System Requirements in README.md)
+ Remove-Item -Path "C:\Strawberry\c\bin" -Recurse -Force
+ shell: pwsh
- name: build
run: |
for /f "usebackq delims=" %%i in (`vswhere.exe -latest -property installationPath`) do if exist "%%i\Common7\Tools\vsdevcmd.bat" call "%%i\Common7\Tools\vsdevcmd.bat" -arch=x64 -host_arch=x64
[nifi-minifi-cpp] 04/04: MINIFICPP-2257 update windows sqliteodbc hash to v0.99991
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 0276dab71f253f6f363e6f21276590d5e7941b0a
Author: Martin Zink <ma...@apache.org>
AuthorDate: Tue Oct 24 13:06:17 2023 +0200
MINIFICPP-2257 update windows sqliteodbc hash to v0.99991
Closes #1691
Signed-off-by: Marton Szasz <sz...@apache.org>
---
.github/workflows/ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 24b56cd90..7e5702797 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -100,7 +100,7 @@ jobs:
- id: install-sqliteodbc-driver
run: |
Invoke-WebRequest -Uri "http://www.ch-werner.de/sqliteodbc/sqliteodbc_w64.exe" -OutFile "sqliteodbc_w64.exe"
- if ((Get-FileHash 'sqliteodbc_w64.exe').Hash -ne "0df79be4a4412542839ebf405b20d95a7dfc803da0b0b6b0dc653d30dc82ee84") {Write "Hash mismatch"; Exit 1}
+ if ((Get-FileHash 'sqliteodbc_w64.exe').Hash -ne "a4804e4f54f42c721df1323c5fcac101a8c7a577e7f20979227324ceab572d51") {Write "Hash mismatch"; Exit 1}
Start-Process -FilePath ".\sqliteodbc_w64.exe" -ArgumentList "/S" -Wait
shell: powershell
- id: remove-strawberry-perl-tool-executables
[nifi-minifi-cpp] 02/04: MINIFICPP-2254 Fix template error in VS2022 build
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 874496efc73d3cb929fa13c564f0a045ed057984
Author: Ferenc Gerlits <fg...@gmail.com>
AuthorDate: Tue Oct 24 13:03:14 2023 +0200
MINIFICPP-2254 Fix template error in VS2022 build
The concept-based function overloading in map_args used to work in
Visual Studio 2019, and also in Visual Studio 2022 up to version 19.35.
Since version 19.36, it has stopped working. The version with requires
instead of the concept works in all versions, up to 19.37.
Closes #1687
Signed-off-by: Marton Szasz <sz...@apache.org>
---
libminifi/include/core/logging/Logger.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libminifi/include/core/logging/Logger.h b/libminifi/include/core/logging/Logger.h
index 13a35d54e..4a011021f 100644
--- a/libminifi/include/core/logging/Logger.h
+++ b/libminifi/include/core/logging/Logger.h
@@ -98,8 +98,8 @@ class BaseLogger {
[[nodiscard]] virtual LOG_LEVEL level() const = 0;
};
-const auto inline map_args = utils::overloaded {
- [](std::invocable<> auto&& f) { return std::invoke(std::forward<decltype(f)>(f)); },
+inline constexpr auto map_args = utils::overloaded {
+ [](auto&& f) requires(std::is_invocable_v<decltype(f)>) { return std::invoke(std::forward<decltype(f)>(f)); },
[](auto&& value) { return std::forward<decltype(value)>(value); }
};
[nifi-minifi-cpp] 03/04: MINIFICPP-1712 Wait for SQL ODBC driver install to finish in CI
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 4dc44c7ea2cd19efa9b62fcd3d5b030db269c151
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Tue Oct 24 13:03:36 2023 +0200
MINIFICPP-1712 Wait for SQL ODBC driver install to finish in CI
Closes #1689
Signed-off-by: Marton Szasz <sz...@apache.org>
---
.github/workflows/ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 554827371..24b56cd90 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -101,7 +101,7 @@ jobs:
run: |
Invoke-WebRequest -Uri "http://www.ch-werner.de/sqliteodbc/sqliteodbc_w64.exe" -OutFile "sqliteodbc_w64.exe"
if ((Get-FileHash 'sqliteodbc_w64.exe').Hash -ne "0df79be4a4412542839ebf405b20d95a7dfc803da0b0b6b0dc653d30dc82ee84") {Write "Hash mismatch"; Exit 1}
- ./sqliteodbc_w64.exe /S
+ Start-Process -FilePath ".\sqliteodbc_w64.exe" -ArgumentList "/S" -Wait
shell: powershell
- id: remove-strawberry-perl-tool-executables
run: |