Merge branch 'master' into woodfell/follow_v5_deprecation_plan

woodfell · web-flow · commit ebc237bca99b · 2023-12-09T15:04:21.000+11:00
diff --git a/.github/workflows/generator.yaml b/.github/workflows/generator.yaml
@@ -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: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)
diff --git a/HOWTO.md b/HOWTO.md
@@ -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
diff --git a/c/include/libsbp/version.h b/c/include/libsbp/version.h
@@ -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
diff --git a/docs/sbp.pdf b/docs/sbp.pdf
diff --git a/haskell/sbp.cabal b/haskell/sbp.cabal
@@ -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
@@ -173,4 +173,4 @@ test-suite test
                      , tasty
                      , tasty-hunit
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall
-  default-language:    Haskell2010
+  default-language:    Haskell2010
diff --git a/javascript/sbp/RELEASE-VERSION b/javascript/sbp/RELEASE-VERSION
@@ -1 +1 @@
-5.0.4-alpha
+5.0.5-alpha
diff --git a/jsonschema/MsgFileioReadDirResp.json b/jsonschema/MsgFileioReadDirResp.json
@@ -17,7 +17,7 @@
   "type": "object",
   "properties": {
     "sequence": {"type": "integer"},
-    "contents": {"type": "array", "items": {"type": "integer"}}
+    "contents": {"type": "string"}
   },
   "required": [
     "sequence",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -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/*",
diff --git a/python/sbp/RELEASE-VERSION b/python/sbp/RELEASE-VERSION
@@ -1 +1 @@
-5.0.3
+5.0.4
diff --git a/python/tox.ini b/python/tox.ini
@@ -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
 
diff --git a/rust/sbp/Cargo.toml b/rust/sbp/Cargo.toml
@@ -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 <dev@swiftnav.com>"]
 repository = "https://github.com/swift-nav/libsbp"
diff --git a/rust/sbp2json/Cargo.toml b/rust/sbp2json/Cargo.toml
@@ -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 <dev@swiftnav.com>"]
diff --git a/rust/sbp2json/release-hook.sh b/rust/sbp2json/release-hook.sh
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sbp",`
`3`		`- "version": "5.0.4-alpha",`
	`3`	`+ "version": "5.0.5-alpha",`
`4`	`4`	`"description": "libsbp bindings for JavaScript. More information here: http://swift-nav.github.io/libsbp/",`
`5`	`5`	`"files": [`
`6`	`6`	`"javascript/*",`