From a3a2b2b8613cf5bafdbaf66f8a2c07a200b25335 Mon Sep 17 00:00:00 2001 From: cuisongliu Date: Sat, 18 Nov 2023 12:03:46 +0800 Subject: [PATCH] docs(main): support arm64 release docs Signed-off-by: cuisongliu --- crates/libcontainer/Cargo.toml | 2 +- crates/youki/Cargo.toml | 14 +++++++------- justfile | 2 ++ scripts/release_tag.sh | 13 +++++++++---- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/crates/libcontainer/Cargo.toml b/crates/libcontainer/Cargo.toml index b2dca140a..abc4b917c 100644 --- a/crates/libcontainer/Cargo.toml +++ b/crates/libcontainer/Cargo.toml @@ -43,7 +43,7 @@ oci-spec = { version = "~0.6.4", features = ["runtime"] } once_cell = "1.18.0" procfs = "0.16.0" prctl = "1.0.0" -libcgroups = { version = "0.3.0", path = "../libcgroups", default-features = false } +libcgroups = { path = "../libcgroups", default-features = false, version = "0.3.0" } # MARK: Version libseccomp = { version = "0.3.0", optional = true } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/crates/youki/Cargo.toml b/crates/youki/Cargo.toml index 5da06f135..223322cf0 100644 --- a/crates/youki/Cargo.toml +++ b/crates/youki/Cargo.toml @@ -29,9 +29,9 @@ features = ["std", "suggestions", "derive", "cargo", "help", "usage", "error-con [dependencies] anyhow = "1.0.75" chrono = { version = "0.4", default-features = false, features = ["clock", "serde"] } -libcgroups = { version = "0.3.0", path = "../libcgroups", default-features = false } -libcontainer = { version = "0.3.0", path = "../libcontainer", default-features = false } -liboci-cli = { version = "0.3.0", path = "../liboci-cli" } +libcgroups = { path = "../libcgroups", default-features = false, version = "0.3.0" } # MARK: Version +libcontainer = { path = "../libcontainer", default-features = false, version = "0.3.0" } # MARK: Version +liboci-cli = { path = "../liboci-cli", version = "0.3.0" } # MARK: Version nix = "0.27.1" once_cell = "1.18.0" pentacle = "1.0.0" @@ -44,9 +44,9 @@ caps = "0.5.5" wasmer = { version = "4.0.0", optional = true } wasmer-wasix = { version = "0.9.0", optional = true } wasmedge-sdk = { version = "0.13.2", optional = true } -wasmtime = {version = "10.0.2", optional = true } -wasmtime-wasi = {version = "10.0.2", optional = true } -tracing = { version = "0.1.40", features = ["attributes"]} +wasmtime = { version = "10.0.2", optional = true } +wasmtime-wasi = { version = "10.0.2", optional = true } +tracing = { version = "0.1.40", features = ["attributes"] } tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] } tracing-journald = "0.3.0" @@ -57,4 +57,4 @@ scopeguard = "1.2.0" [build-dependencies] anyhow = "1.0.75" -vergen = {version ="8.2.6", features =["git","gitcl"]} +vergen = { version = "8.2.6", features = ["git", "gitcl"] } diff --git a/justfile b/justfile index 6d5162b8a..321d580a6 100644 --- a/justfile +++ b/justfile @@ -190,4 +190,6 @@ ci-musl-prepare: ci-prepare exit 1 version-up version: + git grep -l "^version = .* # MARK: Version" | xargs sed -i 's/version = "[0-9]\.[0-9]\.[0-9]" # MARK: Version/version = "{{version}}" # MARK: Version/g' + git grep -l "} # MARK: Version" | grep -v justfile | xargs sed -i 's/version = "[0-9]\.[0-9]\.[0-9]" } # MARK: Version/version = "{{version}}" } # MARK: Version/g' {{ cwd }}/scripts/release_tag.sh {{version}} \ No newline at end of file diff --git a/scripts/release_tag.sh b/scripts/release_tag.sh index c7299e83b..4882c8077 100755 --- a/scripts/release_tag.sh +++ b/scripts/release_tag.sh @@ -6,17 +6,22 @@ if [ -z "$TAG" ]; then echo "Error: No version number provided." exit 1 fi +VERSION=${TAG##*v} +MAJOR=${VERSION%%.*} +MINOR=${VERSION%.*} +MINOR=${MINOR#*.} +PATCH=${VERSION##*.} START_MARKER="" END_MARKER="" echo "\`\`\`console -\$ wget -qO youki_${TAG}_linux.tar.gz https://github.com/containers/youki/releases/download/v${TAG}/youki_${TAG}_linux-\$(uname -m).tar.gz -\$ tar -zxvf youki_${TAG}_linux.tar.gz --strip-components=1 +\$ wget -qO youki_${VERSION}_linux.tar.gz https://github.com/containers/youki/releases/download/v${VERSION}/youki_${MAJOR}_${MINOR}_${PATCH}_linux-\$(uname -m).tar.gz +\$ tar -zxvf youki_${VERSION}_linux.tar.gz --strip-components=1 # Maybe you need root privileges. -\$ mv youki-${TAG}/youki /usr/local/bin/youki -\$ rm -rf youki_${TAG}_linux.tar.gz youki-${TAG} +\$ mv youki-${VERSION}/youki /usr/local/bin/youki +\$ rm -rf youki_${VERSION}_linux.tar.gz youki-${VERSION} \`\`\`" > replace_content.txt awk -v start="$START_MARKER" -v end="$END_MARKER" -v newfile="replace_content.txt" '