Skip to content

Commit

Permalink
codegen: Address cargo-cyclonedx 0.5.1 asset change
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e committed Jan 28, 2025
1 parent 544f616 commit 6fde044
Show file tree
Hide file tree
Showing 4 changed files with 210 additions and 16 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com

## [Unreleased]

- Support `cargo-cyclonedx` on x86_64 Linux (musl).

- Support installing native binary for `cargo-cyclonedx` on AArch64 macOS. (Previously x86_64 macOS binary is used as fallback.)

- Update `cargo-cyclonedx@latest` to 0.5.7.

## [2.47.29] - 2025-01-28

- Support `cargo-semver-checks` on AArch64 Linux.
Expand Down
195 changes: 185 additions & 10 deletions manifests/cargo-cyclonedx.json

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

3 changes: 1 addition & 2 deletions tools/ci/tool-list.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ cd -- "$(dirname -- "$0")"/../..
# They don't provide prebuilt binaries for musl or old glibc host.
# version `GLIBC_2.34' not found
glibc_pre_2_34_incompat=(
cargo-cyclonedx
cargo-spellcheck
wait-for-them
xbuild
Expand Down Expand Up @@ -36,7 +35,7 @@ glibc_pre_2_27_incompat=(
# version `GLIBC_2.17' not found
glibc_pre_2_17_incompat=(
"${glibc_pre_2_27_incompat[@]}"
deepsource
deepsource # https://github.com/DeepSourceCorp/cli/issues/245
)
musl_incompat=(
"${glibc_pre_2_17_incompat[@]}"
Expand Down
22 changes: 18 additions & 4 deletions tools/codegen/base/cargo-cyclonedx.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,30 @@
"repository": "https://github.com/CycloneDX/cyclonedx-rust-cargo",
"tag_prefix": "cargo-cyclonedx-",
"rust_crate": "${package}",
"bin": "${package}-${rust_target}/${package}${exe}",
"version_range": ">= 0.5.0",
"platform": {
"x86_64_linux_gnu": {
"asset_name": "${package}-linux-amd64.tar.gz"
},
"x86_64_linux_musl": {
"asset_name": "${package}-${rust_target}.tar.xz"
},
"x86_64_macos": {
"asset_name": "${package}-Darwin-x86_64.tar.gz"
"asset_name": [
"${package}-${rust_target}.tar.xz",
"${package}-Darwin-x86_64.tar.gz"
]
},
"x86_64_windows": {
"asset_name": "${package}-Win-x86_64.zip"
"asset_name": [
"${package}-${rust_target}.zip",
"${package}-Win-x86_64.zip"
],
"bin": "${package}${exe}"
},
"x86_64_linux_gnu": {
"asset_name": "${package}-linux-amd64.tar.gz"
"aarch64_macos": {
"asset_name": "${package}-${rust_target}.tar.xz"
}
}
}

0 comments on commit 6fde044

Please sign in to comment.