Skip to content

Commit 57f2d4f

Browse files
committed
codegen: Pin cargo-binstall version in base manifest
1 parent 4702276 commit 57f2d4f

2 files changed

Lines changed: 18 additions & 9 deletions

File tree

tools/codegen/base/cargo-binstall.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"tag_prefix": "v",
55
"rust_crate": "${package}",
66
"asset_name": "${package}-${rust_target}.zip",
7-
"version_range": "latest",
7+
"version_range": "=1.18.1",
88
"signing": {
99
"kind": "minisign-binstall"
1010
},

tools/codegen/src/main.rs

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,9 @@ fn main() {
129129

130130
let mut latest_only = false;
131131
if let Some(version_range) = &base_info.version_range {
132-
if version_range == "latest" {
132+
if version_range == "latest"
133+
|| version_range.starts_with('=') && !version_range.contains(',')
134+
{
133135
latest_only = true;
134136
}
135137
}
@@ -171,13 +173,20 @@ fn main() {
171173

172174
let version_req: semver::VersionReq = match version_req {
173175
_ if latest_only => {
174-
// Exclude very recently released version from candidate for latest version.
175-
let req =
176-
format!("={}", releases.iter().find(|r| r.1.1.published_at <= before).unwrap().0.0)
177-
.parse()
178-
.unwrap();
179-
eprintln!("update manifest for versions '{req}'");
180-
req
176+
let version_range = base_info.version_range.as_ref().unwrap();
177+
if version_range == "latest" {
178+
// Exclude very recently released version from candidate for latest version.
179+
let req = format!(
180+
"={}",
181+
releases.iter().find(|r| r.1.1.published_at <= before).unwrap().0.0
182+
)
183+
.parse()
184+
.unwrap();
185+
eprintln!("update manifest for versions '{req}'");
186+
req
187+
} else {
188+
version_range.parse().unwrap()
189+
}
181190
}
182191
None => match base_info.version_range {
183192
Some(version_range) => version_range.parse().unwrap(),

0 commit comments

Comments
 (0)