Merge pull request #1175 from redboltz/update_to_c_7.0.0

Update the version to 7.0.0

.github/workflows/coverage.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: install depends
       run: |
         sudo apt-get update
@@ -42,12 +42,14 @@ jobs:
         CMAKE_LIBRARY_PATH="${BASE}/build" GTEST_ROOT="${BASE}/usr" CMAKE_PREFIX_PATH="${BASE}/usr/gcc/lib64/cmake" cmake -DMSGPACK_32BIT=OFF -DBUILD_SHARED_LIBS=ON -DMSGPACK_CHAR_SIGN=signed -DMSGPACK_BUILD_EXAMPLES=ON -DMSGPACK_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DMSGPACK_GEN_COVERAGE=ON ..
         make -j4
         make test
-    - name: Upload coverage to Codecov
-      working-directory: build
+    - name: Generate coverage
       run: |
         # Create lcov report
         lcov --capture --directory . --output-file coverage.info
         lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter system-files
         lcov --list coverage.info # debug info
-        # Uploading report to CodeCov
-        bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v5
+      with:
+        files: build/coverage.info
+        token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/gha.yml

@@ -17,7 +17,7 @@ jobs:
       matrix:
         pattern: [0, 1, 2, 3]
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: install gtest
       run: |
         brew install --force googletest
@@ -167,19 +167,19 @@ jobs:
         CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" GTEST_ROOT="${BASE}/usr" CFLAGS="-Werror -g -gdwarf-4 -fsanitize=undefined  -fno-sanitize-recover=all" CXXFLAGS="-Werror -g -ggdb3 -gdwarf-4 -fsanitize=undefined  -fno-sanitize-recover=all" ${ACTION}
 
   windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
         pattern: [0, 1, 2, 3]
     steps:
-    - uses: actions/checkout@v2.0.0
+    - uses: actions/checkout@v3
     - name: Cache vcpkg
       id: cache-vcpkg
-      uses: actions/cache@v1.1.2
+      uses: actions/cache@v3
       with:
         path: C:/vcpkg/installed
-        key: windows-2019-vcpkg-v2
+        key: windows-2022-vcpkg-v2
     - name: Build dependencies
       if: steps.cache-vcpkg.outputs.cache-hit != 'true'
       shell: powershell

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2026-05-30 version 7.0.0
+  * Refine CI (#1152)
+## << breaking changes >>
+  * Updated cmake minimum required to 3.5-4.0 (#1160)
+
 # 2024-08-17 version 6.1.0
   * Add object initializer functions (#1137)
   * Fix cmake warnings (#1133, #1137)

CMakeLists.txt

@@ -1,17 +1,4 @@
-if(${CMAKE_VERSION} VERSION_GREATER "3.4")
-    CMAKE_MINIMUM_REQUIRED (VERSION 3.5)
-else()
-    CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12)
-    IF ((CMAKE_VERSION VERSION_GREATER 3.1) OR
-        (CMAKE_VERSION VERSION_EQUAL 3.1))
-        CMAKE_POLICY(SET CMP0054 NEW)
-    ENDIF ()
-endif()
-
-IF ((CMAKE_VERSION VERSION_GREATER 3.27) OR
-    (CMAKE_VERSION VERSION_EQUAL 3.27))
-    CMAKE_POLICY(SET CMP0145 OLD)
-ENDIF ()
+CMAKE_MINIMUM_REQUIRED (VERSION 3.5...4.0)
 
 OPTION (MSGPACK_BUILD_TESTS "Build msgpack tests." OFF)
 OPTION (MSGPACK_GEN_COVERAGE "Enable running gcov to get a test coverage report." OFF)
@@ -200,11 +187,11 @@ ENDIF ()
 
 IF (MSGPACK_BUILD_TESTS)
     ENABLE_TESTING ()
+    INCLUDE(CTest)
     list(APPEND CMAKE_CTEST_ARGUMENTS "--output-on-failure")
     # MEMORYCHECK_COMMAND_OPTIONS needs to place prior to CTEST_MEMORYCHECK_COMMAND
     SET (MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --show-leak-kinds=definite,possible --error-exitcode=1")
     FIND_PROGRAM(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
-    INCLUDE(Dart)
     ADD_SUBDIRECTORY (test)
 ENDIF ()
 

README.md

@@ -1,8 +1,8 @@
 `msgpack` for C
 ===================
 
-Version 6.1.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=c_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/c_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/c_master)
-[![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/c_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/c_master)
+Version 7.0.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=c_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/c_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/c_master)
+[![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/c_master/graph/badge.svg)](https://app.codecov.io/gh/msgpack/msgpack-c/tree/c_master)
 
 It's like JSON but smaller and faster.
 

appveyor.yml

@@ -1,4 +1,4 @@
-version: 6.1.0.{build}
+version: 7.0.0.{build}
 
 branches:
   only:
@@ -22,10 +22,10 @@ build_script:
 - cmake --build . --config Release
 - cd ..
 - cd ..
-- appveyor DownloadFile http://zlib.net/zlib-1.3.1.tar.gz -FileName zlib-1.3.1.tar.gz
-- 7z x zlib-1.3.1.tar.gz > NUL
-- 7z x zlib-1.3.1.tar > NUL
-- cd zlib-1.3.1
+- appveyor DownloadFile http://zlib.net/zlib-1.3.2.tar.gz -FileName zlib-1.3.2.tar.gz
+- 7z x zlib-1.3.2.tar.gz > NUL
+- 7z x zlib-1.3.2.tar > NUL
+- cd zlib-1.3.2
 - md build
 - cd build
 - cmake -G %msvc% ..
@@ -35,9 +35,9 @@ build_script:
 - cd ..
 - md build
 - cd build
-- cmake -G %msvc% -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.3.1\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.3.1 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
+- cmake -G %msvc% -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.3.2\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.3.2 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
 - cmake --build . --config Release -v
 
 test_script:
-- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release;%APPVEYOR_BUILD_FOLDER%\zlib-1.3\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release
+- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release;%APPVEYOR_BUILD_FOLDER%\zlib-1.3.2\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release
 - ctest -V

cmake/CodeCoverage.cmake

@@ -48,7 +48,7 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
 
 	# Show info where to find the report
 	ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
-		COMMAND ;
+        COMMAND ${CMAKE_COMMAND} -E echo ""
 		COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
 	)
 

codecov.yml

@@ -27,10 +27,6 @@ comment:
 
 ignore:
   - "test"
-  - "fuzz"
-  - "erb"
   - "ci"
   - "cmake"
-  - "examle"
-  - "external"
-  - "usr"
+  - "example"

include/msgpack/version_master.h

@@ -1,3 +1,3 @@
-#define MSGPACK_VERSION_MAJOR    6
-#define MSGPACK_VERSION_MINOR    1
+#define MSGPACK_VERSION_MAJOR    7
+#define MSGPACK_VERSION_MINOR    0
 #define MSGPACK_VERSION_REVISION 0

test/msgpack_c.cpp

@@ -1688,17 +1688,17 @@ TEST(MSGPACKC, init_msgpack_obj_ext) {
     EXPECT_STREQ(buffer, obj.via.ext.ptr);
 }
 
+#define BUFFER_SIZE 4
 TEST(MSGPACKC, init_msgpack_obj_array) {
     msgpack_object obj;
     char buffer[][7] = {"test_1", "test_2", "test_3", "test_4"};
-    uint32_t buffer_size = 4;
-    msgpack_object array[buffer_size];
-    for(size_t i = 0; i < buffer_size; i++) {
+    msgpack_object array[BUFFER_SIZE];
+    for(size_t i = 0; i < BUFFER_SIZE; i++) {
         msgpack_object_init_str(&array[i], buffer[i], (uint32_t)strlen(buffer[i]));
     }
-    msgpack_object_init_array(&obj, array, buffer_size);
+    msgpack_object_init_array(&obj, array, BUFFER_SIZE);
     EXPECT_EQ(MSGPACK_OBJECT_ARRAY, obj.type);
-    for(size_t i = 0; i < buffer_size; i++) {
+    for(size_t i = 0; i < BUFFER_SIZE; i++) {
         EXPECT_STREQ(buffer[i], obj.via.array.ptr[i].via.str.ptr);
     }
 }