Skip to content

Commit

Permalink
Release v7.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
arobenko committed Jan 15, 2025
2 parents 6f18da3 + c7681f0 commit 15a82a8
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 2 deletions.
97 changes: 97 additions & 0 deletions .github/workflows/actions_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,53 @@ jobs:
shell: bash
run: ctest -V

build_gcc_no_sanitize_ubuntu_24_04:
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
type: [Release]
cc_ver: [13, 14]
cpp: [17, 20, 23]
qt_ver: [5]
exclude:
- cc_ver: 13
cpp: 23

steps:
- uses: actions/checkout@v4

- name: Prepare Install
run: sudo apt-get update --fix-missing

- name: Install Packages
run: |
sudo apt install libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}}
- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
run: |
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install \
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
-DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON \
-DCOMMSDSL_BUILD_COMMSDSL2SWIG=ON -DCOMMSDSL_BUILD_COMMSDSL2EMSCRIPTEN=ON \
-DCOMMSDSL_BUILD_WITH_SANITIZERS=OFF -DCOMMSDSL_BUILD_UNIT_TESTS=OFF
env:
CC: gcc-${{matrix.cc_ver}}
CXX: g++-${{matrix.cc_ver}}

- name: Build Target
working-directory: ${{runner.workspace}}/build
shell: bash
run: cmake --build . --config ${{matrix.type}} --target install
env:
VERBOSE: 1

build_clang_old_ubuntu_20_04:
runs-on: ubuntu-20.04
strategy:
Expand Down Expand Up @@ -577,6 +624,56 @@ jobs:
shell: bash
run: ctest -V

build_clang_no_sanitize_ubuntu_24_04:
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
type: [Release]
cc_ver: [16, 17, 18]
cpp: [17, 20, 23]
qt_ver: [5]
exclude:
- cc_ver: 16
cpp: 23
- cc_ver: 17
cpp: 23

steps:
- uses: actions/checkout@v4

- name: Prepare Install
run: sudo apt-get update --fix-missing

- name: Install Packages
run: |
sudo apt install libxml2-dev clang-${{matrix.cc_ver}}
- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
run: |
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install \
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
-DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON \
-DCOMMSDSL_BUILD_COMMSDSL2SWIG=ON -DCOMMSDSL_BUILD_COMMSDSL2EMSCRIPTEN=ON \
-DCOMMSDSL_BUILD_WITH_SANITIZERS=OFF -DCOMMSDSL_BUILD_UNIT_TESTS=OFF
env:
CC: clang-${{matrix.cc_ver}}
CXX: clang++-${{matrix.cc_ver}}

- name: Build Target
working-directory: ${{runner.workspace}}/build
shell: bash
run: cmake --build . --config ${{matrix.type}} --target install
env:
VERBOSE: 1

build_msvc_2019:
runs-on: windows-2019
strategy:
Expand Down
2 changes: 1 addition & 1 deletion lib/include/commsdsl/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#define COMMSDSL_MINOR_VERSION 0U

/// @brief Patch level of the library
#define COMMSDSL_PATCH_VERSION 0U
#define COMMSDSL_PATCH_VERSION 1U

/// @brief Macro to create numeric version as single unsigned number
#define COMMSDSL_MAKE_VERSION(major_, minor_, patch_) \
Expand Down
2 changes: 1 addition & 1 deletion lib/src/parse/DataFieldImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ bool DataFieldImpl::updateValidValues()
std::sort(
m_state.m_validValues.begin(), m_state.m_validValues.end(),
[](auto& elem1, auto& elem2) {
return elem1.m_value < elem2.m_value;
return std::lexicographical_compare(elem1.m_value.begin(), elem1.m_value.end(), elem2.m_value.begin(), elem2.m_value.end());
});

return true;
Expand Down

0 comments on commit 15a82a8

Please sign in to comment.