Skip to content

Commit

Permalink
Merge pull request #39 from DEMCON/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
jhrutgers authored Oct 20, 2022
2 parents 4655698 + 2d6b09c commit 8840fc9
Show file tree
Hide file tree
Showing 129 changed files with 2,156 additions and 3,077 deletions.
40 changes: 27 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@ jobs:
strategy:
fail-fast: false
matrix:
gcc: [9, 10]
gcc: [9, 10, 11]
cxx: [C++03, C++11, C++14, C++17]
zmq: [zmq, nozmq]
include:
- gcc: 10
- gcc: 11
cxx: C++17
zmq: zmq
zth: zth
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
CC: gcc-${{matrix.gcc}}
CXX: g++-${{matrix.gcc}}
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: bootstrap
run: |
sudo apt update
dist/ubuntu/bootstrap.sh
sudo apt install clang-tidy clang libegl1
sudo apt install clang-tidy clang libegl1 cppcheck
- name: build Debug
run: dist/ubuntu/build.sh Debug dev ${{matrix.cxx}} ${{matrix.zmq}} ${{matrix.zth}} test
- name: build Release
Expand All @@ -42,14 +42,14 @@ jobs:
dist/ubuntu/build.sh Release ${{matrix.cxx}} ${{matrix.zmq}} ${{matrix.zth}} test
build-ubuntu-prev:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: bootstrap
run: |
dist/ubuntu/bootstrap.sh
sudo apt install clang-tidy clang libegl1
sudo apt install clang-tidy clang libegl1 cppcheck
- name: build Debug
run: dist/ubuntu/build.sh Debug dev test
- name: build Release
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
zth: zth
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: bootstrap
run: dist\win32\bootstrap.cmd
- name: build Debug
Expand All @@ -91,7 +91,7 @@ jobs:
runs-on: macos-latest
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: bootstrap
run: dist/macos/bootstrap.sh
- name: build Debug
Expand All @@ -105,7 +105,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: bootstrap
run: |
sudo apt update
Expand All @@ -118,9 +118,23 @@ jobs:
rm -rf dist/mingw/build
dist/mingw/build.sh Release
test-documentation:
if: github.ref != 'refs/heads/master'
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
- name: bootstrap
run: |
sudo apt update
dist/ubuntu/bootstrap.sh
sudo apt install libegl1
- name: build
run: dist/ubuntu/build.sh -DLIBSTORED_DOCUMENTATION=ON -DLIBSTORED_PYLIBSTORED=ON -DLIBSTORED_HAVE_ZTH=ON

# Dummy job that depends on all other build-* jobs.
build-all:
needs: [build-ubuntu, build-ubuntu-prev, build-windows, build-mac, build-mingw]
needs: [build-ubuntu, build-ubuntu-prev, build-windows, build-mac, build-mingw, test-documentation]
runs-on: ubuntu-latest
steps:
- name: done
Expand All @@ -133,7 +147,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: bootstrap
run: |
sudo apt update
Expand Down
25 changes: 24 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,30 @@ The format is based on `Keep a Changelog`_, and this project adheres to `Semanti

...

.. _Unreleased: https://github.com/DEMCON/libstored/compare/v1.2.0...HEAD
.. _Unreleased: https://github.com/DEMCON/libstored/compare/v1.3.0...HEAD

`1.3.0`_ - 2022-10-20
---------------------

Added
``````

- Maximum error for PID.
- Stream visualization in the Embedded Debugger.

Changed
```````

- Switch license to MPLv2.

Fixed
`````

- Fix in computing ``stored::Ramp`` acceleration and speed.
- Fix in compressed Debugger streams upon internal buffer overflow.
- Handle unaligned memory access properly in store objects.

.. _1.3.0: https://github.com/DEMCON/libstored/releases/tag/v1.3.0



Expand Down
19 changes: 6 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
# libstored, distributed debuggable data stores.
# Copyright (C) 2020-2022 Jochem Rutgers
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at https://mozilla.org/MPL/2.0/.

cmake_minimum_required(VERSION 3.1)
project(libstored)
Expand Down Expand Up @@ -191,7 +182,9 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.6.0")
# ...except when running in Windows, which only supports C++14 or later.
(NOT WIN32 OR NOT CMAKE_CXX_STANDARD EQUAL 11) AND
# ...or Zth is used, which is not compatible with the MSVC headers, which are used by clang-tidy.
(NOT WIN32 OR NOT LIBSTORED_HAVE_ZTH)
(NOT WIN32 OR NOT LIBSTORED_HAVE_ZTH) AND
# ...and somehow mingw builds don't work properly on newer versions of clang-tidy.
(NOT MINGW)
)
# It seems that if clang is not installed, clang-tidy doesn't work properly.
find_program(CLANG_EXE NAMES "clang" DOC "Path to clang executable")
Expand Down
15 changes: 3 additions & 12 deletions CMakeLists.txt.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,9 @@
# libstored, distributed debuggable data stores.
# Copyright (C) 2020-2022 Jochem Rutgers
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#}

cmake_minimum_required(VERSION 3.1)
Expand Down
Loading

0 comments on commit 8840fc9

Please sign in to comment.