From dfc3562d99814f5d7f12d6c71c1b4695689f1784 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Wed, 24 Jun 2026 09:25:46 -0500 Subject: [PATCH 1/4] Bump libntech to latest Ticket: none Changelog: none --- libntech | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libntech b/libntech index 11be6817ae..b05a7a3d16 160000 --- a/libntech +++ b/libntech @@ -1 +1 @@ -Subproject commit 11be6817ae8067aa3a1626a3871deb872093e0e2 +Subproject commit b05a7a3d1664bbc5ec7b029071cb54a80154c925 From 1b5fc78254a9c3215c7b001c871517f8088e80f5 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Wed, 24 Jun 2026 10:49:01 -0500 Subject: [PATCH 2/4] Added -Wextra and -Wno-sign-compare to github workflow gcc options This will catch more warnings as errors and help us keep our code cleaner. Ticket: ENT-14208 Changelog: none (cherry picked from commit 7544e662172f423207d35f21f109cba77a35d9a4) --- .github/workflows/asan_unit_tests.yml | 2 +- .github/workflows/macos_unit_tests.yml | 2 +- .github/workflows/unit_tests.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/asan_unit_tests.yml b/.github/workflows/asan_unit_tests.yml index 6e1a4b9d9e..5de1588c8a 100644 --- a/.github/workflows/asan_unit_tests.yml +++ b/.github/workflows/asan_unit_tests.yml @@ -15,6 +15,6 @@ jobs: - name: Run autotools / configure run: ./autogen.sh --enable-debug - name: Compile and link (make) - run: make -j8 CFLAGS="-Werror -Wall -fsanitize=address" LDFLAGS="-fsanitize=address" + run: make -j8 CFLAGS="-Werror -Wall -Wextra -Wno-sign-compare -fsanitize=address" LDFLAGS="-fsanitize=address" - name: Run unit tests run: make -C tests/unit CFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address" check diff --git a/.github/workflows/macos_unit_tests.yml b/.github/workflows/macos_unit_tests.yml index 014c5cdcc8..193eb86c27 100644 --- a/.github/workflows/macos_unit_tests.yml +++ b/.github/workflows/macos_unit_tests.yml @@ -20,6 +20,6 @@ jobs: run: > ./autogen.sh --enable-debug - name: Compile and link - run: MACOSX_DEPLOYMENT_TARGET=15.4 make -j8 CFLAGS="-Werror -Wall" + run: MACOSX_DEPLOYMENT_TARGET=15.4 make -j8 CFLAGS="-Werror -Wall -Wextra -Wno-sign-compare" - name: Run unit tests run: make -C tests/unit check diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index c46cb5b19a..0f72353e21 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -16,6 +16,6 @@ jobs: - name: Run autotools / configure run: ./autogen.sh --enable-debug - name: Compile and link (make) - run: make -j8 CFLAGS="-Werror -Wall" + run: make -j8 CFLAGS="-Werror -Wall -Wextra -Wno-sign-compare" - name: Run unit tests run: make -C tests/unit check From 7a0c85995b66d224b2fb79fc2b17667ec1ed6e1b Mon Sep 17 00:00:00 2001 From: Simon Halvorsen Date: Fri, 26 Jun 2026 00:11:06 +0200 Subject: [PATCH 3/4] Fix: Added missing comma in json - getindices_returns_expected_list_from_datacontainer Ticket: ENT-14036 Changelog: None Signed-off-by: Simon Halvorsen (cherry picked from commit 4c6bb8e1fcde50381d6b9399a69e25389ad4f4e1) --- .../getindices_returns_expected_list_from_datacontainer.cf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_datacontainer.cf b/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_datacontainer.cf index 6fc8f93606..d675ebd424 100644 --- a/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_datacontainer.cf +++ b/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_datacontainer.cf @@ -22,7 +22,10 @@ bundle agent init "alpha", "bravo" ], - "bar": { "one": "1" "two": "2" } + "bar": { + "one": "1", + "two": "2" + } }'); } From 448fd170f92b5f5b42b946395433a4a8e6845c79 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Thu, 30 Apr 2026 13:11:33 +0200 Subject: [PATCH 4/4] rules.json: Added missing comma Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 210c807cb868ef6225b22f8545d1725262173ebb) --- .../10_files/file_select_attrs_consistent_behavior/rules.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/10_files/file_select_attrs_consistent_behavior/rules.json b/tests/acceptance/10_files/file_select_attrs_consistent_behavior/rules.json index 352beedf05..be311e4319 100644 --- a/tests/acceptance/10_files/file_select_attrs_consistent_behavior/rules.json +++ b/tests/acceptance/10_files/file_select_attrs_consistent_behavior/rules.json @@ -1,6 +1,6 @@ [ { -"location": "/tmp/logs/tidy" +"location": "/tmp/logs/tidy", "context": "any", "action": "TIDY", "frequency": "10",