Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-21 08:16:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the aster-frame version used by OSDK

Browse Source
This commit is contained in:
Jianfeng Jiang
2024-06-21 12:41:28 +00:00
committed by Tate, Hongliang Tian
parent c75a3732b9
commit 237c223b1c
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.5.0 0.5.0

2
osdk/src/commands/build/bin.rs
View File

@ -158,7 +158,7 @@ fn install_setup_with_arch(
cmd.arg("--force"); cmd.arg("--force");
cmd.arg("--root").arg(install_dir.as_ref()); cmd.arg("--root").arg(install_dir.as_ref());
cmd.arg("--git").arg(crate::util::ASTER_GIT_LINK); cmd.arg("--git").arg(crate::util::ASTER_GIT_LINK);
cmd.arg("--rev").arg(crate::util::ASTER_GIT_REV); cmd.arg("--tag").arg(crate::util::ASTER_GIT_TAG);
cmd.arg("--target").arg(match arch { cmd.arg("--target").arg(match arch {
SetupInstallArch::X86_64 => "x86_64-unknown-none", SetupInstallArch::X86_64 => "x86_64-unknown-none",
SetupInstallArch::Other(path) => path.to_str().unwrap(), SetupInstallArch::Other(path) => path.to_str().unwrap(),

8
osdk/src/util.rs
View File

@ -16,11 +16,13 @@ use quote::ToTokens;
/// and use the published version in the generated Cargo.toml. /// and use the published version in the generated Cargo.toml.
pub const ASTER_GIT_LINK: &str = "https://github.com/asterinas/asterinas"; pub const ASTER_GIT_LINK: &str = "https://github.com/asterinas/asterinas";
/// Make sure it syncs with the builder dependency in Cargo.toml. /// Make sure it syncs with the builder dependency in Cargo.toml.
pub const ASTER_GIT_REV: &str = "ccc4e6e"; /// We cannot use `include_str!("../../VERSION")` here
/// because `cargo publish` does not allow using files outside of the crate directory.
pub const ASTER_GIT_TAG: &str = concat!("v", env!("CARGO_PKG_VERSION"));
pub fn aster_crate_dep(crate_name: &str) -> String { pub fn aster_crate_dep(crate_name: &str) -> String {
format!( format!(
"{} = {{ git = \"{}\", rev = \"{}\" }}", "{} = {{ git = \"{}\", tag = \"{}\" }}",
crate_name, ASTER_GIT_LINK, ASTER_GIT_REV crate_name, ASTER_GIT_LINK, ASTER_GIT_TAG
) )
} }

3
tools/bump_version.sh
View File

@ -129,6 +129,7 @@ GET_STARTED_PATH=${ASTER_SRC_DIR}/docs/src/kernel/README.md
update_image_versions $GET_STARTED_PATH update_image_versions $GET_STARTED_PATH
# Create or update VERSION # Create or update VERSION
echo "${new_version}" > ${VERSION_PATH} # `-n` is used to avoid adding a '\n' in the VERSION file.
echo -n "${new_version}" > ${VERSION_PATH}
echo "Bumped Asterinas & OSDK version to $new_version" echo "Bumped Asterinas & OSDK version to $new_version"