Skip to content

Commit

Permalink
XXX-DELETEME
Browse files Browse the repository at this point in the history
  • Loading branch information
vvv committed Oct 8, 2023
1 parent e0222d6 commit 033cb52
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 135 deletions.
92 changes: 0 additions & 92 deletions .github/workflows/check.yml

This file was deleted.

51 changes: 8 additions & 43 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
toolchain: [stable, beta]
toolchain: [stable]
#XXX toolchain: [stable, beta]
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -36,50 +37,14 @@ jobs:
if: hashFiles('rust/Cargo.lock') == ''
# https://twitter.com/jonhoo/status/1571290371124260865
- name: cargo test
run: cargo test --locked --all-features --all-targets --workspace
run: |
echo XXX; pwd
echo XXX; ls -l
echo XXX; ls -l ..
echo XXX; ls -l ../pcap/ || true
cargo test --locked --all-features --all-targets --workspace -- --nocapture
working-directory: rust/
# https://github.com/rust-lang/cargo/issues/6669
- name: cargo test --doc
run: cargo test --locked --all-features --doc --workspace
working-directory: rust/

minimal:
name: ubuntu / stable / minimal-versions
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Install stable
uses: dtolnay/rust-toolchain@stable
- name: Install nightly for -Zminimal-versions
uses: dtolnay/rust-toolchain@nightly
- run: rustup default stable
- run: cargo +nightly update -Zminimal-versions --workspace
working-directory: rust/
- run: cargo test --locked --all-features --all-targets --workspace
working-directory: rust/

os-check:
name: ${{ matrix.os }} / stable
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os:
# NOTE: Don't use GitHub-hosted macOS runners in a non-public repository --
# they consume CI/CD minutes like crazy; see
# https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions#minute-multipliers
- windows-latest
#- macos-latest
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Install stable
uses: dtolnay/rust-toolchain@stable
- run: cargo generate-lockfile
if: hashFiles('rust/Cargo.lock') == ''
- name: cargo test
run: cargo test --locked --all-features --all-targets --workspace
working-directory: rust/
1 change: 1 addition & 0 deletions rust/ja4/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ tracing-subscriber.workspace = true

[dev-dependencies]
expect-test = "1.4"
fs-err.workspace = true # XXX-DELETEME
insta = { version = "1.33", features = ["glob", "yaml"] }
pretty_assertions = "1.4"
2 changes: 2 additions & 0 deletions rust/ja4/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ fn test_insta() {
concat!(env!("CARGO_MANIFEST_DIR"), "/../.."),
"pcap/*.pcap*",
|path| {
dbg!(("XXX", std::env::current_dir().unwrap(), path));
let _f = fs_err::File::open(path).unwrap();
let cli = Cli {
json: false,
with_raw: false,
Expand Down

0 comments on commit 033cb52

Please sign in to comment.