Skip to content

Commit

Permalink
Merge branch 'main' into json-output
Browse files Browse the repository at this point in the history
  • Loading branch information
tertsdiepraam committed Jun 21, 2024
2 parents 51b6c3a + 7ebd4bd commit d1eaea7
Show file tree
Hide file tree
Showing 25 changed files with 1,004 additions and 278 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/pkg.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Packaging

on:
# Since this workflow is quite costly, we only run it automatically on
# release tags. Otherwise trigger it manually.
push:
tags:
- v*

# Allow manually triggering the workflow.
workflow_dispatch:

jobs:
package:
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
with:
package_build_rules: pkg/rules/packages-to-build.yml
package_test_scripts_path: pkg/test-scripts/test-<package>.sh
156 changes: 124 additions & 32 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 22 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dnsi"
version = "0.1.0"
version = "0.2.0"
edition = "2021"
rust-version = "1.78.0"
authors = ["NLnet Labs <[email protected]>"]
Expand All @@ -13,11 +13,24 @@ license = "BSD-3-Clause"
exclude = [ ".github", ".gitignore" ]

[dependencies]
bytes = "1"
clap = { version = "4", features = ["derive", "unstable-doc"] }
chrono = { version = "0.4.38", features = [ "alloc", "clock", "serde" ] }
domain = { version = "0.10.0", features = ["resolv", "unstable-client-transport", "serde"] }
tempfile = "3.1.0"
tokio = { version = "1.33", features = ["rt-multi-thread"] }
serde_json = { version = "1.0.117", features = ["preserve_order"] }
serde = "1.0.202"
bytes = "1"
chrono = { version = "0.4.38", features = [ "alloc", "clock", "serde" ] }
clap = { version = "4", features = ["derive", "unstable-doc"] }
domain = { version = "0.10", features = ["resolv", "unstable-client-transport", "serde"]}
serde = { version = "1.0.202", features = ["derive"] }
serde_json = { version = "1.0.117", features = ["preserve_order"] }
tempfile = "3.1.0"
tokio = { version = "1.33", features = ["rt-multi-thread"] }
tokio-rustls = { version = "0.26.0", default-features = false, features = [ "ring", "logging", "tls12" ] }
webpki-roots = "0.26.3"

[package.metadata.deb]
extended-description = """\
The dnsi utility is a command line tool for investigating various \
aspects of the DNS."""

[package.metadata.generate-rpm]
license = "BSD"
assets = [
{ source = "target/release/dnsi", dest = "/usr/bin/dnsi", mode = "755" },
]
Loading

0 comments on commit d1eaea7

Please sign in to comment.