Skip to content

Commit

Permalink
Improving CI scripts - run docrs in the process (#240)
Browse files Browse the repository at this point in the history
* Improving CI scripts - run docrs in the process
* remove debug trace
* remove unused variable
* add more ci scripts

---------

Signed-off-by: Guillaume W. Bres <[email protected]>
  • Loading branch information
gwbres authored Apr 27, 2024
1 parent 9cd94d8 commit c3e4c4b
Show file tree
Hide file tree
Showing 13 changed files with 56 additions and 136 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,16 @@ jobs:
with:
command: build
args: --all-features --release

- uses: actions-rs/toolchain@v1
name: Install nightly
with:
toolchain: nightly
override: true

- name: Documentation
run: |
./tools/builddoc.sh
windows-build:
runs-on: windows-latest
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
debug/
target/
logs/

test_resources/

Expand Down
4 changes: 2 additions & 2 deletions crx2rnx/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "crx2rnx"
version = "2.3.3"
version = "2.3.4"
license = "MIT OR Apache-2.0"
authors = ["Guillaume W. Bres <[email protected]>"]
description = "RINEX data decompressor"
Expand All @@ -12,4 +12,4 @@ readme = "README.md"

[dependencies]
clap = { version = "4.4.13", features = ["derive", "color"] }
rinex = { path = "../rinex", version = "=0.16.0", features = ["serde"] }
rinex = { path = "../rinex", version = "=0.16.1", features = ["serde"] }
6 changes: 3 additions & 3 deletions rinex-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rinex-cli"
version = "0.11.0"
version = "0.11.1"
license = "MIT OR Apache-2.0"
authors = ["Guillaume W. Bres <[email protected]>"]
description = "Command line tool parse and analyze RINEX data"
Expand Down Expand Up @@ -32,8 +32,8 @@ horrorshow = "0.8"
clap = { version = "4.4.13", features = ["derive", "color"] }
hifitime = { version = "3.9.0", features = ["serde", "std"] }
gnss-rs = { version = "2.1.3" , features = ["serde"] }
rinex = { path = "../rinex", version = "=0.16.0", features = ["full"] }
rinex-qc = { path = "../rinex-qc", version = "=0.1.13", features = ["serde"] }
rinex = { path = "../rinex", version = "=0.16.1", features = ["full"] }
rinex-qc = { path = "../rinex-qc", version = "=0.1.14", features = ["serde"] }
sp3 = { path = "../sp3", version = "=1.0.8", features = ["serde", "flate2"] }
serde = { version = "1.0", default-features = false, features = ["derive"] }

Expand Down
4 changes: 2 additions & 2 deletions rinex-qc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rinex-qc"
version = "0.1.13"
version = "0.1.14"
license = "MIT OR Apache-2.0"
authors = ["Guillaume W. Bres <[email protected]>"]
description = "RINEX data analysis"
Expand Down Expand Up @@ -28,7 +28,7 @@ itertools = "0.12.0"
statrs = "0.16"
sp3 = { path = "../sp3", version = "=1.0.8", features = ["serde"] }
rinex-qc-traits = { path = "../qc-traits", version = "=0.1.1" }
rinex = { path = "../rinex", version = "=0.16.0", features = ["full"] }
rinex = { path = "../rinex", version = "=0.16.1", features = ["full"] }
gnss-rs = { version = "2.1.3", features = ["serde"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion rinex/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rinex"
version = "0.16.0"
version = "0.16.1"
license = "MIT OR Apache-2.0"
authors = ["Guillaume W. Bres <[email protected]>"]
description = "Package to parse and analyze RINEX data"
Expand Down
2 changes: 1 addition & 1 deletion rinex/src/domes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use thiserror::Error;
use serde::{Deserialize, Serialize};

#[cfg(docrs)]
pub use bibliography::Bibliography;
pub use crate::bibliography::Bibliography;

/// DOMES parsing error
#[derive(Debug, Error)]
Expand Down
3 changes: 1 addition & 2 deletions rinex/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2516,7 +2516,6 @@ impl Rinex {
*/
let t0 = self.first_epoch().unwrap(); // will fail on invalid RINEX
let t0 = Epoch::from_utc_days(t0.to_utc_days().round());
dbg!(t0);
Box::new(
self.header
.ionod_corrections
Expand Down Expand Up @@ -2645,7 +2644,7 @@ impl Rinex {
carrier: Carrier,
) -> Option<f64> {
// determine nearest in time
let (t_i, (model_sv, model)) = self
let (_, (model_sv, model)) = self
.ionod_correction_models()
.filter_map(|(t_i, (_, sv_i, msg_i))| {
// TODO
Expand Down
4 changes: 2 additions & 2 deletions rnx2crx/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rnx2crx"
version = "1.2.3"
version = "1.2.4"
license = "MIT OR Apache-2.0"
authors = ["Guillaume W. Bres <[email protected]>"]
description = "RINEX data compressor"
Expand All @@ -14,4 +14,4 @@ readme = "README.md"
[dependencies]
thiserror = "1"
clap = { version = "4.4.13", features = ["derive", "color"] }
rinex = { path = "../rinex", version = "=0.16.0", features = ["serde"] }
rinex = { path = "../rinex", version = "=0.16.1", features = ["serde"] }
27 changes: 27 additions & 0 deletions tools/ci-ppp.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#! /bin/bash
# Small script to test PPP capabilities across toolbox updates

# make sure we're in the correct setup
cargo build --all-features -r

LOGS="logs/ci/ppp"
APP="./target/release/rinex-cli -q"

PPP_CONTEXT="-f test_resources/CRNX/V3/ESBC00DNK_R_20201770000_01D_30S_MO.crx.gz \
-f test_resources/NAV/V3/ESBC00DNK_R_20201770000_01D_MN.rnx.gz \
-f test_resources/CLK/V3/GRG0MGXFIN_20201770000_01D_30S_CLK.CLK.gz \
-f test_resources/SP3/GRG0MGXFIN_20201770000_01D_15M_ORB.SP3.gz"

mkdir -p $LOGS
export RUST_LOG=trace

# Default PPP | GPS
$APP $PPP_CONTEXT -P GPS -p | tee $LOGS/gps_default.logs
# Default PPP + CGGTTS | GPS
$APP $PPP_CONTEXT -P GPS -p --cggtts | tee $LOGS/gps_default_cggtts.logs
# Default PPP | GAL
$APP $PPP_CONTEXT -P GAL -p | tee $LOGS/galileo_default.logs
# Advanced SPP | GPS
$APP $PPP_CONTEXT -P GPS -p -c rinex-cli/config/rtk/gpst_spp_basic.json | tee $LOGS/gps_spp_advanced.logs
# # Advanced SPP | GAL
$APP $PPP_CONTEXT -P GPS -p -c rinex-cli/config/rtk/gst_spp_basic.json | tee $LOGS/galileo_spp_advanced.logs
118 changes: 0 additions & 118 deletions tools/test-binaries.sh

This file was deleted.

7 changes: 4 additions & 3 deletions tools/testlib.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#! /bin/sh
VERBOSE=$1
cargo test --features tests
cargo test --all-features
cargo fmt
cargo test -- --nocapture
cargo test --all-features -- --nocapture
./tools/builddoc.sh
4 changes: 2 additions & 2 deletions ublox-rnx/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ublox-rnx"
version = "0.1.6"
version = "0.1.7"
license = "MIT OR Apache-2.0"
authors = ["Guillaume W. Bres <[email protected]>"]
description = "Efficient RINEX production from a Ublox GNSS receiver"
Expand All @@ -22,4 +22,4 @@ serialport = "4.2.0"
ublox = "0.4.4"
clap = { version = "4.4.10", features = ["derive", "color"] }
gnss-rs = { version = "2.1.3", features = ["serde"] }
rinex = { path = "../rinex", version = "=0.16.0", features = ["serde", "nav", "obs", "clock"] }
rinex = { path = "../rinex", version = "=0.16.1", features = ["serde", "nav", "obs", "clock"] }

0 comments on commit c3e4c4b

Please sign in to comment.