mirror of
https://github.com/taiki-e/install-action.git
synced 2026-05-10 14:40:32 +00:00
Update spdx requirement from 0.11 to 0.12 (#1102)
This commit is contained in:
@@ -14,7 +14,7 @@ serde = "1"
|
|||||||
serde_derive = "1"
|
serde_derive = "1"
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
sha2 = "0.10"
|
sha2 = "0.10"
|
||||||
spdx = "0.11"
|
spdx = "0.12"
|
||||||
tar = "0.4"
|
tar = "0.4"
|
||||||
toml = { version = "0.9", default-features = false, features = ["parse", "serde"] }
|
toml = { version = "0.9", default-features = false, features = ["parse", "serde"] }
|
||||||
# TODO: call curl command instead of using ureq?
|
# TODO: call curl command instead of using ureq?
|
||||||
|
|||||||
@@ -834,16 +834,14 @@ fn get_license_markdown(spdx_expr: &str, repo: &str, default_branch: &str) -> Op
|
|||||||
ExprNode::Req(ExpressionReq {
|
ExprNode::Req(ExpressionReq {
|
||||||
req:
|
req:
|
||||||
spdx::LicenseReq {
|
spdx::LicenseReq {
|
||||||
license: spdx::LicenseItem::Spdx { id, or_later },
|
license: spdx::LicenseItem::Spdx { id, or_later }, addition, ..
|
||||||
exception,
|
|
||||||
..
|
|
||||||
},
|
},
|
||||||
..
|
..
|
||||||
}) => {
|
}) => {
|
||||||
if *or_later {
|
if *or_later {
|
||||||
panic!("need to handle or_later");
|
panic!("need to handle or_later");
|
||||||
}
|
}
|
||||||
if let Some(exception_id) = exception {
|
if let Some(spdx::AdditionItem::Spdx(exception_id)) = addition {
|
||||||
license_ids.push((id, Some(exception_id)));
|
license_ids.push((id, Some(exception_id)));
|
||||||
} else {
|
} else {
|
||||||
license_ids.push((id, None));
|
license_ids.push((id, None));
|
||||||
|
|||||||
Reference in New Issue
Block a user