Skip to content

Commit 6fde044

Browse files
committed
codegen: Address cargo-cyclonedx 0.5.1 asset change
1 parent 544f616 commit 6fde044

File tree

4 files changed

+210
-16
lines changed

4 files changed

+210
-16
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
1010

1111
## [Unreleased]
1212

13+
- Support `cargo-cyclonedx` on x86_64 Linux (musl).
14+
15+
- Support installing native binary for `cargo-cyclonedx` on AArch64 macOS. (Previously x86_64 macOS binary is used as fallback.)
16+
17+
- Update `cargo-cyclonedx@latest` to 0.5.7.
18+
1319
## [2.47.29] - 2025-01-28
1420

1521
- Support `cargo-semver-checks` on AArch64 Linux.

manifests/cargo-cyclonedx.json

Lines changed: 185 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/ci/tool-list.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ cd -- "$(dirname -- "$0")"/../..
88
# They don't provide prebuilt binaries for musl or old glibc host.
99
# version `GLIBC_2.34' not found
1010
glibc_pre_2_34_incompat=(
11-
cargo-cyclonedx
1211
cargo-spellcheck
1312
wait-for-them
1413
xbuild
@@ -36,7 +35,7 @@ glibc_pre_2_27_incompat=(
3635
# version `GLIBC_2.17' not found
3736
glibc_pre_2_17_incompat=(
3837
"${glibc_pre_2_27_incompat[@]}"
39-
deepsource
38+
deepsource # https://github.com/DeepSourceCorp/cli/issues/245
4039
)
4140
musl_incompat=(
4241
"${glibc_pre_2_17_incompat[@]}"

tools/codegen/base/cargo-cyclonedx.json

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,30 @@
22
"repository": "https://github.com/CycloneDX/cyclonedx-rust-cargo",
33
"tag_prefix": "cargo-cyclonedx-",
44
"rust_crate": "${package}",
5+
"bin": "${package}-${rust_target}/${package}${exe}",
56
"version_range": ">= 0.5.0",
67
"platform": {
8+
"x86_64_linux_gnu": {
9+
"asset_name": "${package}-linux-amd64.tar.gz"
10+
},
11+
"x86_64_linux_musl": {
12+
"asset_name": "${package}-${rust_target}.tar.xz"
13+
},
714
"x86_64_macos": {
8-
"asset_name": "${package}-Darwin-x86_64.tar.gz"
15+
"asset_name": [
16+
"${package}-${rust_target}.tar.xz",
17+
"${package}-Darwin-x86_64.tar.gz"
18+
]
919
},
1020
"x86_64_windows": {
11-
"asset_name": "${package}-Win-x86_64.zip"
21+
"asset_name": [
22+
"${package}-${rust_target}.zip",
23+
"${package}-Win-x86_64.zip"
24+
],
25+
"bin": "${package}${exe}"
1226
},
13-
"x86_64_linux_gnu": {
14-
"asset_name": "${package}-linux-amd64.tar.gz"
27+
"aarch64_macos": {
28+
"asset_name": "${package}-${rust_target}.tar.xz"
1529
}
1630
}
1731
}

0 commit comments

Comments
 (0)