Merge pull request #1176 from redboltz/update_to_cpp_8.0.0

Update the version to 8.0.0
This commit is contained in:
Takatoshi Kondo
2026-05-30 15:43:06 +09:00
committed by GitHub
6 changed files with 41 additions and 20 deletions
+3 -3
View File
@@ -27,9 +27,9 @@ while getopts "b:t:p:" c; do
done
mkdir $prefix || exit 1
wget https://zlib.net/zlib-1.3.1.tar.gz || exit 1
tar -xf zlib-1.3.1.tar.gz || exit 1
cd zlib-1.3.1
wget https://zlib.net/zlib-1.3.2.tar.gz || exit 1
tar -xf zlib-1.3.2.tar.gz || exit 1
cd zlib-1.3.2
build()
{
+17 -7
View File
@@ -100,34 +100,44 @@ jobs:
sudo apt-get install g++-10-multilib -y # for 32-bit compile
./ci/set_gcc_10.sh
- name: Set Architecture Environment
shell: bash
run: |
if [ "${{ matrix.pattern }}" = "5" ] || [ "${{ matrix.pattern }}" = "11" ]; then
echo "ARCH=32" >> $GITHUB_ENV
echo "BOOST_BIT=both" >> $GITHUB_ENV
else
echo "ARCH=64" >> $GITHUB_ENV
echo "BOOST_BIT=64" >> $GITHUB_ENV
fi
- name: Cache boost
id: cache-boost
uses: actions/cache@v3
with:
path: ~/boost-prefix/
key: ${{ runner.os }}-boost-1-85-0-2024-05-27
key: ${{ runner.os }}-boost-1-85-0-2026-05-30-${{ env.ARCH }}
- name: Build boost
if: steps.cache-boost.outputs.cache-hit != 'true'
run: ./.github/depends/boost.sh -b both -t gcc -p $HOME/boost-prefix
run: ./.github/depends/boost.sh -b ${{ env.BOOST_BIT }} -t gcc -p $HOME/boost-prefix
- name: Cache zlib
id: cache-zlib
uses: actions/cache@v3
with:
path: ~/zlib-prefix/
key: ${{ runner.os }}-zlib-1-2-13-2022-11-02
key: ${{ runner.os }}-zlib-1-3-2-2026-05-30-${{ env.ARCH }}
- name: Build zlib
if: steps.cache-zlib.outputs.cache-hit != 'true'
run: ./.github/depends/zlib.sh -b both -p $HOME/zlib-prefix
run: ./.github/depends/zlib.sh -b ${{ env.BOOST_BIT }} -p $HOME/zlib-prefix
- name: Build and test
shell: bash
run: |
# default configuration - overwrite its params later depending on matrix.pattern
export MSGPACK_CXX_VERSION="MSGPACK_CXX20=ON"
export ARCH=64
export API_VERSION=3
export CHAR_SIGN="signed"
export X3_PARSE="OFF"
@@ -158,8 +168,8 @@ jobs:
export NO_BOOST="-DMSGPACK_NO_BOOST"
;;
5)
# ARCH=32
export CXX="g++-10"
export ARCH=32
;;
6)
export CXX="clang++"
@@ -182,8 +192,8 @@ jobs:
export ACTION="ci/build_regression.sh"
;;
11)
# ARCH=32
export CXX="g++-10"
export ARCH=32
export CHAR_SIGN="unsigned"
export X3_PARSE="ON"
;;
+11
View File
@@ -1,3 +1,14 @@
# 2026-05-30 version 8.0.0
* Add old style find boost applying option to cmake. (#1172)
* Add missing include type_traits (#1162)
* Remove duplicated include (#1156, #1157)
* Fix MSVC C++20 modules error for nested msgpack::object::with_zone (#1154)
* Refine CI (#1150, #1151, #1163)
* Refine documents (#1146, #1149)
## << breaking changes >>
* Update cmake minimum required to 3.5-4.0 (#1159)
# 2024-11-02 version 7.0.0
* Refine build system (#1133)
* Refine CI (#1122)
+1 -1
View File
@@ -1,7 +1,7 @@
`msgpack` for C++
===================
Version 7.0.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=cpp_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/cpp_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/cpp_master)
Version 8.0.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=cpp_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/cpp_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/cpp_master)
[![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master/graph/badge.svg)](https://app.codecov.io/gh/msgpack/msgpack-c/tree/cpp_master)
It's like JSON but smaller and faster.
+8 -8
View File
@@ -1,4 +1,4 @@
version: 7.0.0.{build}
version: 8.0.0.{build}
branches:
only:
@@ -13,10 +13,10 @@ environment:
boost_subdir: lib32-msvc-14.0
build_script:
- ps: |
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 2> $null
7z x zlib-1.3.1.tar 2> $null
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 2> $null
7z x zlib-1.3.2.tar 2> $null
cd zlib-1.3.2
md build
md prefix
@@ -24,7 +24,7 @@ build_script:
cmake `
-G $env:msvc `
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" `
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.2\prefix" `
..
if ($LastExitCode -ne 0) { exit $LastExitCode }
@@ -43,7 +43,7 @@ build_script:
-D MSGPACK_BUILD_TESTS=ON `
-D MSGPACK_BOOST_USE_OLD_CMAKE=ON `
-D CMAKE_EXE_LINKER_FLAGS=/LIBPATH:"$env:boost_prefix\$env:boost_subdir" `
-D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" `
-D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.2\prefix" `
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\prefix" `
-D CMAKE_CXX_FLAGS="/D_VARIADIC_MAX=10 /EHsc /DBOOST_ALL_DYN_LINK" `
..
@@ -53,5 +53,5 @@ build_script:
if ($LastExitCode -ne 0) { exit $LastExitCode }
test_script:
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.3.1\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir%
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.3.2\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir%
- ctest -VV -C Release
+1 -1
View File
@@ -1,3 +1,3 @@
#define MSGPACK_VERSION_MAJOR 7
#define MSGPACK_VERSION_MAJOR 8
#define MSGPACK_VERSION_MINOR 0
#define MSGPACK_VERSION_REVISION 0