Skip to content

Commit

Permalink
fix(update): broken as_bodhi_ver now working (#3157)
Browse files Browse the repository at this point in the history
  • Loading branch information
madonuko authored Jan 31, 2025
1 parent ae2242c commit a32970e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion anda/lib/nvidia/cuda-gcc/update.rhai
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import "andax/bump_extras.rhai" as bump;

rpm.version(bump::bodhi("gcc13", labels.branch.as_bodhi_ver()));
rpm.version(bump::bodhi("gcc13", bump::as_bodhi_ver(labels.branch)));
4 changes: 2 additions & 2 deletions anda/multimedia/ffmpeg/update.rhai
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import "andax/bump_extras.rhai" as bump;

//rpm.version(find(`<small>ffmpeg-([\d.]+?)\.tar\.xz</small>`, get("https://ffmpeg.org/download.html"), 1));
rpm.version(find(`<small>ffmpeg-([\d.]+?)\.tar\.xz</small>`, get("https://ffmpeg.org/download.html"), 1));

let ffmpeg_ver = get(`https://madoguchi.fyralabs.com/v4/terra${labels.branch}/packages/x265`).json().ver;
open_file("anda/fusion/ffmpeg/VERSION_x265.txt", "w").write(ffmpeg_ver);

let tesseract_ver = bump::bodhi("tesseract", labels.branch.as_bodhi_ver());
let tesseract_ver = bump::bodhi("tesseract", bump::as_bodhi_ver(labels.branch));
open_file("anda/fusion/ffmpeg/VERSION_tesseract.txt", "w").write(tesseract_ver);
4 changes: 2 additions & 2 deletions andax/bump_extras.rhai
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ fn as_bodhi_ver(branch) {
}
return `EPEL-${release}`;
} else if branch == "frawhide" {
return "42";
return "F42";
} else if branch.starts_with("f") {
branch.crop(1);
return branch;
return `F${branch}`;
} else {
print(`E: unsupported branch: ${labels.branch}`);
terminate();
Expand Down

0 comments on commit a32970e

Please sign in to comment.