Skip to content

Commit a40acd3

Browse files
author
Jason Mobarak
committed
prep for next release, update CHANGLOG, tweak dist target
+ dist: removed dist-pdf and related targets since this is not how the sbp.pdf doc is distrubted anymore Tags: #no_auto_pr
1 parent eae91d5 commit a40acd3

File tree

10 files changed

+36
-11
lines changed

10 files changed

+36
-11
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Change Log
22

3+
## [v4.0.3](https://github.com/swift-nav/libsbp/tree/v4.0.3) (2021-10-22)
4+
5+
[Full Changelog](https://github.com/swift-nav/libsbp/compare/v4.0.2...v4.0.3)
6+
7+
**Merged pull requests:**
8+
9+
- rust: support Result\<Sbp\> in with\_rover\_time [\#1084](https://github.com/swift-nav/libsbp/pull/1084) ([notoriaga](https://github.com/notoriaga))
10+
311
## [v4.0.2](https://github.com/swift-nav/libsbp/tree/v4.0.2) (2021-10-13)
412

513
[Full Changelog](https://github.com/swift-nav/libsbp/compare/v4.0.1...v4.0.2)

HOWTO.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ inside the container (so you don't have to setup git inside the docker container
228228

229229
- `make dist-javascript`
230230
- `make dist-haskell`
231-
- `make dist-pdf`
232231
- `make dist-rust` (see section on Rust below)
233232
- `make dist-python` (see section on Python below)
234233

@@ -262,8 +261,15 @@ To distribute Rust. Use the `cargo-release` tool:
262261
cargo install cargo-release
263262
```
264263

265-
Release `sbp` and `sbp2json` crates separately, first `sbp`, this will do a dry
266-
run first:
264+
**FIRST** just try running the `dist-rust` target:
265+
266+
```
267+
make dist-rust
268+
```
269+
270+
If that doesn't work (consider fixing the make target), otherwise try releasing
271+
`sbp` and `sbp2json` crates separately, first `sbp`, this will do a dry run
272+
first:
267273
268274
```
269275
cargo release --package sbp <INCREMENTED_TAG>

Makefile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,12 +402,23 @@ dist-python:
402402
dist-javascript:
403403
$(call announce-begin,"Deploying Javascript package")
404404
npm publish
405-
$(call announce-begin,"Finished deploying Javascript package")
405+
$(call announce-end,"Finished deploying Javascript package")
406406

407407
dist-haskell:
408408
$(call announce-begin,"Deploying Haskell package")
409409
(cd $(SWIFTNAV_ROOT)/haskell; stack sdist; stack upload .)
410-
$(call announce-begin,"Finished deploying Haskell package")
410+
$(call announce-end,"Finished deploying Haskell package")
411+
412+
dist-rust:
413+
$(call announce-begin,"Deploying Rust `sbp` package")
414+
cargo release --package sbp --execute $(SBP_VERSION_UNPREFIXED)
415+
$(call announce-end,"Finished deploying Rust `sbp` package")
416+
$(call announce-begin,"Deploying Rust `sbp2json` package")
417+
cargo release --package sbp2json --execute $(SBP_VERSION_UNPREFIXED)
418+
$(call announce-end,"Finished deploying Rust `sbp2json` package")
419+
$(call announce-begin,"Reverting commit made by `sbp2json` deployment")
420+
git reset --hard $(SBP_VERSION)
421+
$(call announce-end,"Finished reverting commit made by `sbp2json` deployment")
411422

412423
dist: dist-python dist-javascript dist-haskell dist-rust
413424

c/include/libsbp/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#define SBP_PATCH_VERSION 3
2929

3030
/** Full SBP version string. */
31-
#define SBP_VERSION "4.0.3"
31+
#define SBP_VERSION "4.0.4-alpha"
3232

3333
/** \} */
3434

docs/sbp.pdf

775 Bytes
Binary file not shown.

haskell/sbp.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: sbp
2-
version: 4.0.3
2+
version: 4.0.4-alpha
33
synopsis: SwiftNav's SBP Library
44
homepage: https://github.com/swift-nav/libsbp
55
license: MIT

javascript/sbp/RELEASE-VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.3
1+
4.0.4-alpha

python/sbp/RELEASE-VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.3
1+
4.0.4-alpha

rust/sbp/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
[package]
99
name = "sbp"
10-
version = "4.0.3"
10+
version = "4.0.4-alpha"
1111
description = "Rust native implementation of SBP (Swift Binary Protocol) for communicating with devices made by Swift Navigation"
1212
authors = ["Swift Navigation <[email protected]>"]
1313
repository = "https://github.com/swift-nav/libsbp"

rust/sbp2json/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
[package]
99
name = "sbp2json"
10-
version = "4.0.3-unreleased"
10+
version = "4.0.4-alpha"
1111
description = "Rust native implementation of SBP (Swift Binary Protocol) to JSON conversion tools"
1212
authors = ["Swift Navigation <[email protected]>"]
1313
edition = "2018"

0 commit comments

Comments
 (0)