From 95cd39c947f0a868385ce068260103401e25fdd8 Mon Sep 17 00:00:00 2001 From: Cynthia Date: Fri, 4 Jul 2025 03:45:03 +0000 Subject: [PATCH 1/2] upgrade to v0.0.12 -- enable docsrs feature this will enable the doc feature that is necessary for docs.rs to complete successfully. we also go ahead and exclude it from the cargo hack features to ensure that test times don't balloon for something that doesn't affect them --- .github/workflows/feature-matrixes.yml | 6 ++--- .github/workflows/package.yml | 8 +++--- Cargo.lock | 26 ++++++++++---------- Cargo.toml | 2 +- installer-scripts/osx/distribution.arm.xml | 2 +- installer-scripts/osx/distribution.intel.xml | 2 +- installer-scripts/osx/package.sh | 2 +- installer-scripts/unix/nfpm.yaml | 2 +- installer-scripts/win/sprig.wxs | 2 +- pkg/cat-dev/Cargo.toml | 3 ++- pkg/cat-dev/src/lib.rs | 1 + 11 files changed, 29 insertions(+), 27 deletions(-) diff --git a/.github/workflows/feature-matrixes.yml b/.github/workflows/feature-matrixes.yml index 8c740ee..b42a889 100644 --- a/.github/workflows/feature-matrixes.yml +++ b/.github/workflows/feature-matrixes.yml @@ -21,7 +21,7 @@ jobs: - name: Install Rust run: rustup update stable - name: Run Check - run: cargo hack check --feature-powerset + run: cargo hack check --exclude-features docsrs --feature-powerset test: name: Run Non Doc Tests on All Feature Combinations strategy: @@ -36,7 +36,7 @@ jobs: - name: Install Rust run: rustup update stable - name: Run Nextest - run: cargo hack nextest run --feature-powerset --no-tests=pass + run: cargo hack nextest run --exclude-features docsrs --feature-powerset --no-tests=pass env: RUST_BACKTRACE: full doc-test: @@ -53,6 +53,6 @@ jobs: - name: Install Rust run: rustup update stable - name: Run Doc Tests (cat-dev) - run: cargo hack test --doc --feature-powerset --manifest-path "pkg/cat-dev/Cargo.toml" + run: cargo hack test --doc --exclude-features docsrs --feature-powerset --manifest-path "pkg/cat-dev/Cargo.toml" env: RUST_BACKTRACE: full \ No newline at end of file diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index b6ad72c..f3fea10 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -128,19 +128,19 @@ jobs: - uses: actions/upload-artifact@v4 with: name: sprig_unix_amd64.deb - path: installer-scripts/unix/sprig_0.0.11_amd64.deb + path: installer-scripts/unix/sprig_0.0.12_amd64.deb - uses: actions/upload-artifact@v4 with: name: sprig_unix_amd64.rpm - path: installer-scripts/unix/sprig-0.0.11-1.x86_64.rpm + path: installer-scripts/unix/sprig-0.0.12-1.x86_64.rpm - uses: actions/upload-artifact@v4 with: name: sprig_unix_amd64.apk - path: installer-scripts/unix/sprig_0.0.11_x86_64.apk + path: installer-scripts/unix/sprig_0.0.12_x86_64.apk - uses: actions/upload-artifact@v4 with: name: sprig_unix_amd64.pkg.tar.zst - path: installer-scripts/unix/sprig-0.0.11-1-x86_64.pkg.tar.zst + path: installer-scripts/unix/sprig-0.0.12-1-x86_64.pkg.tar.zst - uses: actions/upload-artifact@v4 with: name: sprig-target-directory-unix diff --git a/Cargo.lock b/Cargo.lock index 566a3fa..8380cee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -238,14 +238,14 @@ dependencies = [ [[package]] name = "bridgectl" -version = "0.0.11" +version = "0.0.12" dependencies = [ "cat-dev", "clap", "fnv", "futures", "libc", - "log 0.0.11", + "log 0.0.12", "mac_address", "miette", "terminal_size", @@ -280,7 +280,7 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cat-dev" -version = "0.0.11" +version = "0.0.12" dependencies = [ "aes", "bitflags", @@ -316,7 +316,7 @@ dependencies = [ [[package]] name = "catlog" -version = "0.0.11" +version = "0.0.12" dependencies = [ "tokio", ] @@ -517,13 +517,13 @@ dependencies = [ [[package]] name = "dbg-generate-sata-wal-from-pcap" -version = "0.0.11" +version = "0.0.12" dependencies = [ "bytes", "cat-dev", "clap", "fnv", - "log 0.0.11", + "log 0.0.12", "miette", "rtshark", "tokio", @@ -599,7 +599,7 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "findbridge" -version = "0.0.11" +version = "0.0.12" dependencies = [ "cat-dev", "mac_address", @@ -733,7 +733,7 @@ dependencies = [ [[package]] name = "getbridgeconfig" -version = "0.0.11" +version = "0.0.12" dependencies = [ "cat-dev", "tokio", @@ -1179,7 +1179,7 @@ dependencies = [ [[package]] name = "log" -version = "0.0.11" +version = "0.0.12" dependencies = [ "console-subscriber", "miette", @@ -1298,7 +1298,7 @@ dependencies = [ [[package]] name = "mionparamspace" -version = "0.0.11" +version = "0.0.12" dependencies = [ "cat-dev", "time", @@ -1307,7 +1307,7 @@ dependencies = [ [[package]] name = "mionps" -version = "0.0.11" +version = "0.0.12" dependencies = [ "cat-dev", "time", @@ -1476,7 +1476,7 @@ dependencies = [ [[package]] name = "pcfsserver" -version = "0.0.11" +version = "0.0.12" dependencies = [ "cat-dev", "tokio", @@ -1888,7 +1888,7 @@ dependencies = [ [[package]] name = "setbridgeconfig" -version = "0.0.11" +version = "0.0.12" dependencies = [ "cat-dev", "tokio", diff --git a/Cargo.toml b/Cargo.toml index 76aaff3..ebe6962 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ authors = ["Cynthia "] edition = "2024" license = "MIT" repository = "https://github.com/rem-verse/sprig" -version = "0.0.11" +version = "0.0.12" [profile.release] codegen-units = 1 diff --git a/installer-scripts/osx/distribution.arm.xml b/installer-scripts/osx/distribution.arm.xml index 235ee9f..040a6f4 100644 --- a/installer-scripts/osx/distribution.arm.xml +++ b/installer-scripts/osx/distribution.arm.xml @@ -12,5 +12,5 @@ - + diff --git a/installer-scripts/osx/distribution.intel.xml b/installer-scripts/osx/distribution.intel.xml index 08a0c87..b3dad56 100644 --- a/installer-scripts/osx/distribution.intel.xml +++ b/installer-scripts/osx/distribution.intel.xml @@ -12,5 +12,5 @@ - + diff --git a/installer-scripts/osx/package.sh b/installer-scripts/osx/package.sh index 2c11042..bbc3e0c 100755 --- a/installer-scripts/osx/package.sh +++ b/installer-scripts/osx/package.sh @@ -34,7 +34,7 @@ cp ../../../LICENSE ./ cd ../ echo "Done! Building...." -pkgbuild --root ./working-dir/ --identifier "dev.rem-verse.sprig" --version "0.0.11" --install-location "/usr/local/bin" sprig.pkg +pkgbuild --root ./working-dir/ --identifier "dev.rem-verse.sprig" --version "0.0.12" --install-location "/usr/local/bin" sprig.pkg echo "Done! Preparing Distribution Directory..." mkdir working-dir-pkg diff --git a/installer-scripts/unix/nfpm.yaml b/installer-scripts/unix/nfpm.yaml index 2e55aab..77d900c 100644 --- a/installer-scripts/unix/nfpm.yaml +++ b/installer-scripts/unix/nfpm.yaml @@ -6,7 +6,7 @@ homepage: "https://github.com/rem-verse/sprig" license: "MIT" maintainer: "Cynthia " vendor: "RemVerse" -version: "v0.0.11" +version: "v0.0.12" arch: "amd64" platform: "linux" diff --git a/installer-scripts/win/sprig.wxs b/installer-scripts/win/sprig.wxs index d65858a..eaf742c 100644 --- a/installer-scripts/win/sprig.wxs +++ b/installer-scripts/win/sprig.wxs @@ -6,7 +6,7 @@ diff --git a/pkg/cat-dev/Cargo.toml b/pkg/cat-dev/Cargo.toml index aeeb2ae..65ea12b 100644 --- a/pkg/cat-dev/Cargo.toml +++ b/pkg/cat-dev/Cargo.toml @@ -10,6 +10,7 @@ version.workspace = true [features] default = ["clients", "serial", "servers"] clients = ["bitflags", "form_urlencoded", "local-ip-address", "mac_address", "network-interface", "rand", "reqwest", "tower", "wide"] +docsrs = [] scientists = [] serial = ["libc", "pin-project-lite", "windows"] servers = ["bitflags", "local-ip-address", "rand", "sysinfo", "tower", "wide"] @@ -53,6 +54,6 @@ windows = { version = "^0.61.3", default-features = false, features=["Win32_Devi tempfile = "^3.20.0" [package.metadata.docs.rs] -features = ["clients", "scientists", "serial", "servers"] +features = ["clients", "docsrs", "scientists", "serial", "servers"] rustc-args = ["--cfg", "tokio_unstable", "--cfg", "tracing_unstable"] rustdoc-args = ["--cfg", "tokio_unstable", "--cfg", "tracing_unstable"] \ No newline at end of file diff --git a/pkg/cat-dev/src/lib.rs b/pkg/cat-dev/src/lib.rs index ff2af5b..87c73d2 100644 --- a/pkg/cat-dev/src/lib.rs +++ b/pkg/cat-dev/src/lib.rs @@ -4,6 +4,7 @@ // modules themselves. clippy::module_name_repetitions, )] +#![cfg_attr(docsrs, feature(doc_cfg))] pub mod errors; pub mod fsemul; From 2be6ca25f754b31bf8b97503cd849fe6f0a69e38 Mon Sep 17 00:00:00 2001 From: Cynthia Date: Fri, 4 Jul 2025 03:50:05 +0000 Subject: [PATCH 2/2] remove unnecessary feature --- .github/workflows/feature-matrixes.yml | 6 +++--- pkg/cat-dev/Cargo.toml | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/feature-matrixes.yml b/.github/workflows/feature-matrixes.yml index b42a889..8c740ee 100644 --- a/.github/workflows/feature-matrixes.yml +++ b/.github/workflows/feature-matrixes.yml @@ -21,7 +21,7 @@ jobs: - name: Install Rust run: rustup update stable - name: Run Check - run: cargo hack check --exclude-features docsrs --feature-powerset + run: cargo hack check --feature-powerset test: name: Run Non Doc Tests on All Feature Combinations strategy: @@ -36,7 +36,7 @@ jobs: - name: Install Rust run: rustup update stable - name: Run Nextest - run: cargo hack nextest run --exclude-features docsrs --feature-powerset --no-tests=pass + run: cargo hack nextest run --feature-powerset --no-tests=pass env: RUST_BACKTRACE: full doc-test: @@ -53,6 +53,6 @@ jobs: - name: Install Rust run: rustup update stable - name: Run Doc Tests (cat-dev) - run: cargo hack test --doc --exclude-features docsrs --feature-powerset --manifest-path "pkg/cat-dev/Cargo.toml" + run: cargo hack test --doc --feature-powerset --manifest-path "pkg/cat-dev/Cargo.toml" env: RUST_BACKTRACE: full \ No newline at end of file diff --git a/pkg/cat-dev/Cargo.toml b/pkg/cat-dev/Cargo.toml index 65ea12b..aeeb2ae 100644 --- a/pkg/cat-dev/Cargo.toml +++ b/pkg/cat-dev/Cargo.toml @@ -10,7 +10,6 @@ version.workspace = true [features] default = ["clients", "serial", "servers"] clients = ["bitflags", "form_urlencoded", "local-ip-address", "mac_address", "network-interface", "rand", "reqwest", "tower", "wide"] -docsrs = [] scientists = [] serial = ["libc", "pin-project-lite", "windows"] servers = ["bitflags", "local-ip-address", "rand", "sysinfo", "tower", "wide"] @@ -54,6 +53,6 @@ windows = { version = "^0.61.3", default-features = false, features=["Win32_Devi tempfile = "^3.20.0" [package.metadata.docs.rs] -features = ["clients", "docsrs", "scientists", "serial", "servers"] +features = ["clients", "scientists", "serial", "servers"] rustc-args = ["--cfg", "tokio_unstable", "--cfg", "tracing_unstable"] rustdoc-args = ["--cfg", "tokio_unstable", "--cfg", "tracing_unstable"] \ No newline at end of file