diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e4a0ae2..e5002063 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,8 +57,8 @@ jobs: publish_dir: ./docs/public force_orphan: true - publish: - name: Publish + crates-publish: + name: Publish to crates.io needs: [build-test] if: github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, 'release:') runs-on: ubuntu-latest @@ -71,8 +71,20 @@ jobs: registry-token: ${{ secrets.CRATES_IO_TOKEN }} args: --no-verify - gh-release: - name: Github Release Upload + fh-publish: + name: Publish to FlakeHub + needs: [build-test] + if: github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, 'release:') + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: DeterminateSystems/nix-installer-action@main + - uses: DeterminateSystems/flakehub-push@main + with: + visibility: public + + gh-publish: + name: Publish to Github needs: [build-test] if: github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, 'release:') strategy: diff --git a/Cargo.lock b/Cargo.lock index 4e724dd3..1872ca10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -116,7 +116,7 @@ dependencies = [ [[package]] name = "clang-tidy-sarif" -version = "0.6.4" +version = "0.6.5" dependencies = [ "anyhow", "clap", @@ -167,7 +167,7 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clippy-sarif" -version = "0.6.4" +version = "0.6.5" dependencies = [ "anyhow", "clap", @@ -235,7 +235,7 @@ dependencies = [ [[package]] name = "hadolint-sarif" -version = "0.6.4" +version = "0.6.5" dependencies = [ "anyhow", "clap", @@ -409,7 +409,7 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "sarif-fmt" -version = "0.6.4" +version = "0.6.5" dependencies = [ "anyhow", "clap", @@ -468,7 +468,7 @@ dependencies = [ [[package]] name = "serde-sarif" -version = "0.6.4" +version = "0.6.5" dependencies = [ "anyhow", "cargo_metadata", @@ -531,7 +531,7 @@ dependencies = [ [[package]] name = "shellcheck-sarif" -version = "0.6.4" +version = "0.6.5" dependencies = [ "anyhow", "clap", diff --git a/README.md b/README.md index 67fea9d3..fb2d37b5 100644 --- a/README.md +++ b/README.md @@ -64,10 +64,14 @@ sudo dnf install # ex. cargo binstall sarif-fmt ### Nix +Through the `nix` cli, + ```shell nix --accept-flake-config profile install github:psastras/sarif-rs ``` +Or [from FlakeHub](https://flakehub.com/flake/psastras/sarif-rs). + ## Documentation See each subproject for more detailed information: diff --git a/clang-tidy-sarif/Cargo.toml b/clang-tidy-sarif/Cargo.toml index 80d6b262..59577448 100644 --- a/clang-tidy-sarif/Cargo.toml +++ b/clang-tidy-sarif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clang-tidy-sarif" -version = "0.6.4" +version = "0.6.5" authors = ["Paul Sastrasinh "] edition = "2018" description = "Convert clang-tidy output to SARIF" @@ -21,7 +21,7 @@ path = "src/bin.rs" [dependencies] anyhow = "1.0.86" -serde-sarif = { path = "../serde-sarif", version = "0.6.4", features = ["clang-tidy-converters"] } +serde-sarif = { path = "../serde-sarif", version = "0.6.5", features = ["clang-tidy-converters"] } clap = { version = "4.5.13", features = ["derive"] } duct = "0.13.7" diff --git a/clang-tidy-sarif/src/bin.rs b/clang-tidy-sarif/src/bin.rs index d265f36f..4bda1fdc 100644 --- a/clang-tidy-sarif/src/bin.rs +++ b/clang-tidy-sarif/src/bin.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/clang-tidy-sarif/0.6.4")] +#![doc(html_root_url = "https://docs.rs/clang-tidy-sarif/0.6.5")] //! This crate provides a command line tool to convert `clang-tidy` diagnostic //! output into SARIF. diff --git a/clippy-sarif/Cargo.toml b/clippy-sarif/Cargo.toml index e4abe7e3..015b9397 100644 --- a/clippy-sarif/Cargo.toml +++ b/clippy-sarif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clippy-sarif" -version = "0.6.4" +version = "0.6.5" authors = ["Paul Sastrasinh "] edition = "2018" description = "Convert clippy output to SARIF" @@ -21,7 +21,7 @@ path = "src/bin.rs" [dependencies] anyhow = "1.0.86" -serde-sarif = { path = "../serde-sarif", version = "0.6.4", features = ["clippy-converters"] } +serde-sarif = { path = "../serde-sarif", version = "0.6.5", features = ["clippy-converters"] } clap = { version = "4.5.13", features = ["derive"] } [dev-dependencies] diff --git a/clippy-sarif/src/bin.rs b/clippy-sarif/src/bin.rs index 372d5a33..f961f8ed 100644 --- a/clippy-sarif/src/bin.rs +++ b/clippy-sarif/src/bin.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/clippy-sarif/0.6.4")] +#![doc(html_root_url = "https://docs.rs/clippy-sarif/0.6.5")] //! This crate provides a command line tool to convert `cargo clippy` diagnostic //! output into SARIF. diff --git a/hadolint-sarif/Cargo.toml b/hadolint-sarif/Cargo.toml index d9ed3199..1dd55bc8 100644 --- a/hadolint-sarif/Cargo.toml +++ b/hadolint-sarif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hadolint-sarif" -version = "0.6.4" +version = "0.6.5" authors = ["Paul Sastrasinh "] edition = "2018" description = "Convert hadolint output to SARIF" @@ -21,7 +21,7 @@ path = "src/bin.rs" [dependencies] anyhow = "1.0.86" -serde-sarif = { path = "../serde-sarif", version = "0.6.4", features = ["hadolint-converters"] } +serde-sarif = { path = "../serde-sarif", version = "0.6.5", features = ["hadolint-converters"] } clap = { version = "4.5.13", features = ["derive"] } [dev-dependencies] diff --git a/hadolint-sarif/src/bin.rs b/hadolint-sarif/src/bin.rs index 69afd5b5..8228ac14 100644 --- a/hadolint-sarif/src/bin.rs +++ b/hadolint-sarif/src/bin.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/hadolint-sarif/0.6.4")] +#![doc(html_root_url = "https://docs.rs/hadolint-sarif/0.6.5")] //! This crate provides a command line tool to convert `hadolint` diagnostic //! output into SARIF. diff --git a/sarif-fmt/Cargo.toml b/sarif-fmt/Cargo.toml index e6ba784f..4f06ba0d 100644 --- a/sarif-fmt/Cargo.toml +++ b/sarif-fmt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sarif-fmt" -version = "0.6.4" +version = "0.6.5" authors = ["Paul Sastrasinh "] edition = "2018" description = "View (pretty print) SARIF files in terminal" @@ -22,7 +22,7 @@ path = "src/bin.rs" [dependencies] anyhow = "1.0.86" codespan-reporting = "0.11.1" -serde-sarif = { path = "../serde-sarif", version = "0.6.4" } +serde-sarif = { path = "../serde-sarif", version = "0.6.5" } serde_json = "1.0.122" clap = { version = "4.5.13", features = ["derive"] } diff --git a/sarif-fmt/src/bin.rs b/sarif-fmt/src/bin.rs index cf697d84..8f56dcfe 100644 --- a/sarif-fmt/src/bin.rs +++ b/sarif-fmt/src/bin.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/sarif-fmt/0.6.4")] +#![doc(html_root_url = "https://docs.rs/sarif-fmt/0.6.5")] #![recursion_limit = "256"] //! This crate provides a command line tool to pretty print SARIF files to //! easy human readable output. diff --git a/serde-sarif/Cargo.toml b/serde-sarif/Cargo.toml index 4a4ae702..08f39e4a 100644 --- a/serde-sarif/Cargo.toml +++ b/serde-sarif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde-sarif" -version = "0.6.4" +version = "0.6.5" authors = ["Paul Sastrasinh "] edition = "2018" description = "Serde serialization for SARIF files" diff --git a/serde-sarif/src/lib.rs b/serde-sarif/src/lib.rs index 0d115c01..9f620933 100644 --- a/serde-sarif/src/lib.rs +++ b/serde-sarif/src/lib.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/serde-sarif/0.6.4")] +#![doc(html_root_url = "https://docs.rs/serde-sarif/0.6.5")] //! This crate provides a type safe [serde](https://serde.rs/) compatible //! [SARIF](https://sarifweb.azurewebsites.net/) structure. It is intended diff --git a/shellcheck-sarif/Cargo.toml b/shellcheck-sarif/Cargo.toml index ce82469b..1197fb84 100644 --- a/shellcheck-sarif/Cargo.toml +++ b/shellcheck-sarif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shellcheck-sarif" -version = "0.6.4" +version = "0.6.5" authors = ["Paul Sastrasinh "] edition = "2018" description = "Convert shellcheck output to SARIF" @@ -21,7 +21,7 @@ path = "src/bin.rs" [dependencies] anyhow = "1.0.86" -serde-sarif = { path = "../serde-sarif", version = "0.6.4", features = ["shellcheck-converters"] } +serde-sarif = { path = "../serde-sarif", version = "0.6.5", features = ["shellcheck-converters"] } clap = { version = "4.5.13", features = ["derive"] } [dev-dependencies] diff --git a/shellcheck-sarif/src/bin.rs b/shellcheck-sarif/src/bin.rs index fbd4874e..836ed19b 100644 --- a/shellcheck-sarif/src/bin.rs +++ b/shellcheck-sarif/src/bin.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/shellcheck-sarif/0.6.4")] +#![doc(html_root_url = "https://docs.rs/shellcheck-sarif/0.6.5")] //! This crate provides a command line tool to convert `shellcheck` diagnostic //! output into SARIF.