Skip to content

Commit

Permalink
Merge branch 'master' into woodfell/follow_v5_deprecation_plan
Browse files Browse the repository at this point in the history
  • Loading branch information
woodfell authored Dec 9, 2023
2 parents 7326eb1 + d7b3b44 commit ebc237b
Show file tree
Hide file tree
Showing 15 changed files with 40 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/generator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Generate tests
run: |
rm c/test/auto_check_*.c c/test/cpp/auto_check_*.cc java/test/auto_check_*.java rust/sbp/tests/integration/auto_check_*.rs
make gen-c gen-java gen-rust
make gen-c gen-java gen-rust gen-jsonschema gen-haskell gen-python gen-javascript gen-protobuf
- name: Check generated tests are up to date
run: |
Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Changelog

## [v5.0.4](https://github.com/swift-nav/libsbp/tree/v5.0.4) (2023-12-07)

[Full Changelog](https://github.com/swift-nav/libsbp/compare/v5.0.3...v5.0.4)

**Closed issues:**

- `MsgGpsTime` implementation of `gps\_time` is not checking status flags [\#1363](https://github.com/swift-nav/libsbp/issues/1363)

**Merged pull requests:**

- Fix rust and js tests [\#1383](https://github.com/swift-nav/libsbp/pull/1383) ([woodfell](https://github.com/woodfell))
- Fix decoding of truncated messages containing variable length arrays [\#1381](https://github.com/swift-nav/libsbp/pull/1381) ([woodfell](https://github.com/woodfell))
- Replace swiftnav-adam with woodfell for additional reviewers [\#1380](https://github.com/swift-nav/libsbp/pull/1380) ([woodfell](https://github.com/woodfell))
- Fix incorrect specification of directory contents in read dir resp [\#1379](https://github.com/swift-nav/libsbp/pull/1379) ([woodfell](https://github.com/woodfell))
- Fix decoding fixed length arrays of struct in python sbp2json [\#1378](https://github.com/swift-nav/libsbp/pull/1378) ([woodfell](https://github.com/woodfell))
- Increase test coverage of C code [\#1377](https://github.com/swift-nav/libsbp/pull/1377) ([woodfell](https://github.com/woodfell))
- rust: check more messages for time validity [\#1376](https://github.com/swift-nav/libsbp/pull/1376) ([notoriaga](https://github.com/notoriaga))
- rust: check time source for MsgGpsTime [\#1375](https://github.com/swift-nav/libsbp/pull/1375) ([notoriaga](https://github.com/notoriaga))
- Run sonar cloud on C/C++ bindings [\#1374](https://github.com/swift-nav/libsbp/pull/1374) ([woodfell](https://github.com/woodfell))
- ignore dependabot PRs for additional reviewers action [\#1372](https://github.com/swift-nav/libsbp/pull/1372) ([adrian-kong](https://github.com/adrian-kong))
- Bon voyage! [\#1370](https://github.com/swift-nav/libsbp/pull/1370) ([pcrumley](https://github.com/pcrumley))

## [v5.0.3](https://github.com/swift-nav/libsbp/tree/v5.0.3) (2023-10-19)

[Full Changelog](https://github.com/swift-nav/libsbp/compare/v5.0.2...v5.0.3)
Expand Down
9 changes: 2 additions & 7 deletions HOWTO.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,21 +209,16 @@ inside the container (so you don't have to setup git inside the docker container
make java jsonschema protobuf
```

For C, Haskell and JavaScript:
For C, Haskell and JavaScript (JavaScript, make needs to be run twice to update the package information):

```shell
make c haskell javascript rust
make javascript
git add c/include/libsbp/version.h haskell/sbp.cabal javascript/sbp/RELEASE-VERSION package.json package-lock.json rust/sbp/Cargo.toml
git commit --amend -a -m 'Release <INCREMENTED_TAG>'
git tag -f -a INCREMENTED_TAG -m "Version INCREMENTED_TAG of libsbp."
```

JavaScript, make needs to be run twice to update the package information

```shell
make javascript
```

4. Finally, build the docs:

```shell
Expand Down
4 changes: 2 additions & 2 deletions c/include/libsbp/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
/** Protocol minor version. */
#define SBP_MINOR_VERSION 0
/** Protocol patch version. */
#define SBP_PATCH_VERSION 3
#define SBP_PATCH_VERSION 4

/** Full SBP version string. */
#define SBP_VERSION "5.0.4-alpha"
#define SBP_VERSION "5.0.5-alpha"

/** Is this a staging branch? */
#define SBP_STAGING 0
Expand Down
Binary file modified docs/sbp.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions haskell/sbp.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: sbp
version: 5.0.3-alpha
version: 5.0.5-alpha
synopsis: SwiftNav's SBP Library
homepage: https://github.com/swift-nav/libsbp
license: MIT
Expand Down Expand Up @@ -173,4 +173,4 @@ test-suite test
, tasty
, tasty-hunit
ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall
default-language: Haskell2010
default-language: Haskell2010
2 changes: 1 addition & 1 deletion javascript/sbp/RELEASE-VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.4-alpha
5.0.5-alpha
2 changes: 1 addition & 1 deletion jsonschema/MsgFileioReadDirResp.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"type": "object",
"properties": {
"sequence": {"type": "integer"},
"contents": {"type": "array", "items": {"type": "integer"}}
"contents": {"type": "string"}
},
"required": [
"sequence",
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sbp",
"version": "5.0.4-alpha",
"version": "5.0.5-alpha",
"description": "libsbp bindings for JavaScript. More information here: http://swift-nav.github.io/libsbp/",
"files": [
"javascript/*",
Expand Down
2 changes: 1 addition & 1 deletion python/sbp/RELEASE-VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.3
5.0.4
2 changes: 1 addition & 1 deletion python/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ deps =
passenv =
PYTEST_ADDOPTS
commands =
py.test -v --reruns 5 --cov --cov-append --cov-report=term-missing sbp tests
py.test -v --reruns 2 --cov --cov-append --cov-report=term-missing sbp tests
{toxinidir}/../test_data/sanity.sh
sitepackages = False

Expand Down
2 changes: 1 addition & 1 deletion rust/sbp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

[package]
name = "sbp"
version = "5.0.4-alpha"
version = "5.0.5-alpha"
description = "Rust native implementation of SBP (Swift Binary Protocol) for communicating with devices made by Swift Navigation"
authors = ["Swift Navigation <[email protected]>"]
repository = "https://github.com/swift-nav/libsbp"
Expand Down
2 changes: 1 addition & 1 deletion rust/sbp2json/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

[package]
name = "sbp2json"
version = "5.0.4-alpha"
version = "5.0.5-alpha"
repository = "https://github.com/swift-nav/libsbp"
description = "Rust native implementation of SBP (Swift Binary Protocol) to JSON conversion tools"
authors = ["Swift Navigation <[email protected]>"]
Expand Down
3 changes: 2 additions & 1 deletion rust/sbp2json/release-hook.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env bash

sed -i -e "s@^.*TODO.*replace.*sbp.*\$@version = \"$NEW_VERSION\"@" Cargo.toml
sed -e "s@^.*TODO.*replace.*sbp.*\$@version = \"$NEW_VERSION\"@" Cargo.toml > Cargo.toml.new
mv Cargo.toml.new Cargo.toml

0 comments on commit ebc237b

Please sign in to comment.