Merge pull request #358 from cryptogarageinc/feature/bump-cpp-version

update to v0.4.5
cryptogarageinc · May 20, 2022 · 6b2290c · 6b2290c
2 parents fb2a74a + 85a8c8a
commit 6b2290c
Show file tree

Hide file tree

Showing 8 changed files with 133 additions and 30 deletions.
diff --git a/.github/workflows/check_pre-merge_master.yml b/.github/workflows/check_pre-merge_master.yml
@@ -24,10 +24,16 @@ jobs:
         shared: [on, off]
         include:
           - os: windows-2019
-            shared: [on, off]
+            shared: on
             generator: 'Visual Studio 16 2019'
+          - os: windows-2019
+            shared: off
+            generator: 'Visual Studio 16 2019'
+          - os: windows-2022
+            shared: on
+            generator: 'Visual Studio 17 2022'
           - os: windows-2022
-            shared: [on, off]
+            shared: off
             generator: 'Visual Studio 17 2022'
 
     steps:
@@ -49,7 +55,7 @@ jobs:
     strategy:
       matrix:
         # os: [macos-10.15]
-        os: [macos-10.15, macos-11]
+        os: [macos-10.15, macos-11, macos-12]
         xcode_version: ['11.7']
         include:
           - os: macos-10.15
@@ -58,6 +64,13 @@ jobs:
             xcode_version: '12.5.1'
           - os: macos-11
             xcode_version: '13.2.1'
+          - os: macos-12
+            xcode_version: '13.1'
+          - os: macos-12
+            xcode_version: '13.3.1'
+        exclude:
+          - os: macos-12
+            xcode_version: '11.7'
 
     steps:
     - uses: actions/checkout@v2
@@ -83,11 +96,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-18.04]
+        os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04]
         shared: [on, off]
-        elements: [on, off]
-        exclude:
-          - os: ubuntu-18.04
+        elements: [on]
+        include:
+          - os: ubuntu-22.04
             elements: off
 
     steps:
@@ -109,6 +122,71 @@ jobs:
         ctest -C Release --output-on-failure
         cd ..
 
+  cmake-cpp-support-test:
+    name: cmake build-ubuntu C++ support test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-2022, ubuntu-22.04]
+        cppver: [11, 14, 17, 20]
+        include:
+          - os: windows-2022
+            generator: 'Visual Studio 17 2022'
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: dump version
+      run: |
+        cmake --version
+        gcc --version
+    - name: cmake_configure
+      if: matrix.os != 'windows-2022'
+      run: cmake -S . -B build -G "Unix Makefiles" -DENABLE_SHARED=on -DENABLE_ELEMENTS=on -DENABLE_TESTS=on -DSTD_CPP_VERSION=${{ matrix.cppver }} -DCMAKE_BUILD_TYPE=Release -DTARGET_RPATH=./build/Release
+    - name: cmake_generage vs
+      if: matrix.os == 'windows-2022'
+      run: cmake -S . -B build -G "${{ matrix.generator }}" -A x64 -DENABLE_SHARED=on -DENABLE_TESTS=on -DSTD_CPP_VERSION=${{ matrix.cppver }} -DCMAKE_BUILD_TYPE=Release
+    - name: cmake_build
+      run: cmake --build build --config Release --parallel 4
+    - name: test
+      run: |
+        cd build
+        ctest -C Release --output-on-failure
+        cd ..
+
+  ubuntu-valgrind:
+    name: valgrind-ubuntu
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04]
+        shared: [on]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: dump version
+      run: |
+        cmake --version
+        gcc --version
+    - name: ubuntu-apt-install
+      run: |
+        cat /etc/os-release
+        sudo apt-get update
+        sudo apt-get install -y valgrind
+    - name: cmake-build
+      run: |
+        cmake --version
+        cmake -S . -B build -G "Unix Makefiles" -DENABLE_SHARED=${{ matrix.shared }} -DCMAKE_BUILD_TYPE=Debug -DTARGET_RPATH=./build/Debug
+        cmake --build build --config Debug --parallel 4
+    - name: valgrind
+      run: |
+         # --valgrind-stacksize=1048576 --num-callers=12
+         valgrind -v --tool=memcheck --leak-check=full --valgrind-stacksize=10485760 --log-file=./valgrind.log --time-stamp=yes ./build/Debug/cfd_test
+    - name: upload coverage
+      uses: actions/upload-artifact@v1
+      with:
+        name: valgrind-log
+        path: ./valgrind.log
+
   doxygen-ubuntu:
     name: doxygen-check
     runs-on: ubuntu-18.04

diff --git a/.github/workflows/check_pre-merge_sprint.yml b/.github/workflows/check_pre-merge_sprint.yml
@@ -19,13 +19,19 @@ jobs:
       matrix:
         os: [windows-2019, windows-2022]
         generator: ['MSYS Makefiles']
-        shared: [on]
+        shared: [on, off]
         include:
           - os: windows-2019
-            shared: [on]
+            shared: on
+            generator: 'Visual Studio 16 2019'
+          - os: windows-2019
+            shared: off
             generator: 'Visual Studio 16 2019'
           - os: windows-2022
-            shared: [on]
+            shared: on
+            generator: 'Visual Studio 17 2022'
+          - os: windows-2022
+            shared: off
             generator: 'Visual Studio 17 2022'
 
     steps:
@@ -47,7 +53,7 @@ jobs:
     strategy:
       matrix:
         # os: [macos-10.15]
-        os: [macos-10.15, macos-11]
+        os: [macos-10.15, macos-11, macos-12]
         xcode_version: ['11.7']
         include:
           - os: macos-10.15
@@ -56,6 +62,13 @@ jobs:
             xcode_version: '12.5.1'
           - os: macos-11
             xcode_version: '13.2.1'
+          - os: macos-12
+            xcode_version: '13.1'
+          - os: macos-12
+            xcode_version: '13.3.1'
+        exclude:
+          - os: macos-12
+            xcode_version: '11.7'
 
     steps:
     - uses: actions/checkout@v2
@@ -79,9 +92,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-18.04]
-        shared: [on]
+        os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04]
+        shared: [on, off]
         elements: [on]
+        include:
+          - os: ubuntu-22.04
+            elements: off
 
     steps:
     - uses: actions/checkout@v2
@@ -117,22 +133,29 @@ jobs:
 
   cmake-cpp-support-test:
     name: cmake build-ubuntu C++ support test
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        cppversion: [11, 14, 17, 20]
+        os: [windows-2022, ubuntu-22.04]
+        cppver: [11, 14, 17, 20]
+        include:
+          - os: windows-2022
+            generator: 'Visual Studio 17 2022'
 
     steps:
     - uses: actions/checkout@v2
     - name: dump version
       run: |
         cmake --version
         gcc --version
-    - name: cmake-build
-      run: |
-        cmake --version
-        cmake -S . -B build -G "Unix Makefiles" -DENABLE_SHARED=on -DENABLE_ELEMENTS=on -DCMAKE_BUILD_TYPE=Release -DSTD_CPP_VERSION=${{ matrix.cppversion }} -DTARGET_RPATH=./build/Release
-        cmake --build build --config Debug --parallel 4
+    - name: cmake_configure
+      if: matrix.os != 'windows-2022'
+      run: cmake -S . -B build -G "Unix Makefiles" -DENABLE_SHARED=on -DENABLE_ELEMENTS=on -DENABLE_TESTS=on -DSTD_CPP_VERSION=${{ matrix.cppver }} -DCMAKE_BUILD_TYPE=Release -DTARGET_RPATH=./build/Release
+    - name: cmake_generage vs
+      if: matrix.os == 'windows-2022'
+      run: cmake -S . -B build -G "${{ matrix.generator }}" -A x64 -DENABLE_SHARED=on -DENABLE_TESTS=on -DSTD_CPP_VERSION=${{ matrix.cppver }} -DCMAKE_BUILD_TYPE=Release
+    - name: cmake_build
+      run: cmake --build build --config Release --parallel 4
     - name: test
       run: |
         cd build

diff --git a/.github/workflows/create_release-and-upload.yml b/.github/workflows/create_release-and-upload.yml
@@ -145,7 +145,7 @@ jobs:
       fail-fast: false
       matrix:
 #        os: [ubuntu-20.04, ubuntu-18.04]
-        os_ver: [20, 18]
+        os_ver: [22, 20, 18]
         bin: [gcc, gcc-static]
         include:
           - bin: gcc
@@ -281,7 +281,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ['10.3', '11.7', '12.4', '12.5.1', '13.2.1']
+        xcode: ['10.3', '11.7', '12.4', '12.5.1', '13.2.1', '13.2.1', '13.3.1']
         shared: [on, off]
         include:
           - xcode: '10.3'
@@ -294,6 +294,8 @@ jobs:
             os: macos-11
           - xcode: '13.2.1'
             os: macos-11
+          - xcode: '13.3.1'
+            os: macos-12
           - shared: on
             suffix: ''
           - shared: off

diff --git a/README.md b/README.md
@@ -148,7 +148,7 @@ cmake --build build
 - `-DTARGET_RPATH=xxxxx;yyyyy`: Set rpath (Linux, MacOS). Separator is ';'.
 - `-DCMAKE_BUILD_TYPE=Release`: Enable release build.
 - `-DCMAKE_BUILD_TYPE=Debug`: Enable debug build.
-- `-DSTD_CPP_VERSION=xx`: Set the C++ version. [11,14,17,20] (default:11)
+- `-DSTD_CPP_VERSION=xx`: Set the C++ version. [11,14,17,20] (default:14)
 - `-DCFDCORE_DEBUG=on`: Enable cfd debug mode and loggings log files. [ON/OFF] (default:OFF)
   - Enable debug mode is need `STD_CPP_VERSION` upper 14.
 - `-DCFDCORE_LOG_LEVEL=xxxx`: Set log level. [trace/debug/info/warn] (default:info)

diff --git a/cmake/CfdCommonOption.cmake b/cmake/CfdCommonOption.cmake
@@ -6,7 +6,7 @@ endif()
 option(ENABLE_ELEMENTS "enable elements code (ON or OFF. default:ON)" ON)
 option(ENABLE_TESTS "enable code tests (ON or OFF. default:ON)" ON)
 option(ENABLE_EMSCRIPTEN "enable EMSCRIPTEN (ON or OFF. default:OFF)" OFF)
-option(STD_CPP_VERSION "c++ version (11/14/17. default:11)" "11")
+option(STD_CPP_VERSION "c++ version (11/14/17. default:14)" "14")
 
 # use "cmake -DCMAKE_BUILD_TYPE=Debug" or "cmake-js -D"
 # option(ENABLE_DEBUG "enable debugging (ON or OFF. default:OFF)" OFF)

diff --git a/cmake/Cpp11Setting.cmake b/cmake/Cpp11Setting.cmake
@@ -28,7 +28,7 @@ else()
 set(ENABLE_LOGGING TRUE)
 endif()
 else()
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 set(ENABLE_LOGGING FALSE)
 endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -50,7 +50,7 @@ if(CFDCORE_TARGET_VERSION)
 set(CFDCORE_TARGET_TAG  ${CFDCORE_TARGET_VERSION})
 message(STATUS "[external project local] cfd-core target=${CFDCORE_TARGET_VERSION}")
 else()
-set(CFDCORE_TARGET_TAG  v0.4.3)
+set(CFDCORE_TARGET_TAG  v0.4.4)
 endif()
 if(CFDCORE_TARGET_URL)
 set(CFDCORE_TARGET_REP  ${CFDCORE_TARGET_URL})
@@ -116,7 +116,7 @@ if(GTEST_TARGET_VERSION)
 set(GTEST_TARGET_TAG  ${GTEST_TARGET_VERSION})
 message(STATUS "[external project local] google-test target=${GTEST_TARGET_VERSION}")
 else()
-set(GTEST_TARGET_TAG  cg-release-1.8.1.1)
+set(GTEST_TARGET_TAG  cg-release-1.8.1.2)
 endif()
 
 if(${USE_GIT_SSH})

diff --git a/local_resource/external_project_local_setting.config b/local_resource/external_project_local_setting.config
@@ -1,4 +1,4 @@
-CFD_VERSION=0.4.4
-CFDCORE_TARGET_VERSION=refs/tags/v0.4.3
-LIBWALLY_TARGET_VERSION=refs/tags/cfd-0.4.5
+CFD_VERSION=0.4.5
+CFDCORE_TARGET_VERSION=refs/tags/v0.4.4
+LIBWALLY_TARGET_VERSION=refs/tags/cfd-0.4.7
 CFDCORE_TARGET_URL=cryptogarageinc/cfd-core.git