docs(main): support arm64 release docs (#2510)

* docs(main): support arm64 release docs Signed-off-by: cuisongliu <[email protected]> * docs(main): support arm64 release docs Signed-off-by: cuisongliu <[email protected]> * docs(main): support arm64 release docs Signed-off-by: cuisongliu <[email protected]> --------- Signed-off-by: cuisongliu <[email protected]>
youki-dev · Nov 26, 2023 · ac20fc3 · ac20fc3
1 parent 5b69663
commit ac20fc3
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 15 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -101,7 +101,6 @@ jobs:
           files: |
             ./${{ env.OUTPUTDIR }}-x86_64.tar.gz
             ./${{ env.OUTPUTDIR }}-aarch64.tar.gz
-
   publish:
     name: Publish Packages
     needs: build

diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ tags.temp
 /test.log
 
 /tests/k8s/_out/
+replace_content.txt
diff --git 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
@@ -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/docs/src/user/basic_setup.md b/docs/src/user/basic_setup.md
@@ -46,13 +46,15 @@ $ sudo dnf install          \
 Install from the GitHub release.
 Note that this way also requires the aforementioned installation.
 
+<!--youki release begin-->
 ```console
-$ wget https://github.com/containers/youki/releases/download/v0.3.0/youki_0_3_0_linux.tar.gz
-$ tar -zxvf youki_0_3_0_linux.tar.gz youki_0_3_0_linux/youki-0.3.0/youki
+$ wget -qO youki_0_3_0_linux.tar.gz https://github.com/containers/youki/releases/download/v0.3.0/youki_0_3_0_linux.tar.gz
+$ tar -zxvf youki_0_3_0_linux.tar.gz --strip-components=1
 # Maybe you need root privileges.
-$ mv youki_0_3_0_linux/youki-0.3.0/youki /usr/local/bin/youki
-$ rm -rf youki_0_3_0_linux.tar.gz youki_0_3_0_linux
+$ mv youki-0.3.0/youki /usr/local/bin/youki
+$ rm -rf youki_0_3_0_linux.tar.gz youki-0_3_0
 ```
+<!--youki release end-->
 
 ## Getting the source
 

diff --git a/justfile b/justfile
@@ -191,5 +191,5 @@ ci-musl-prepare: ci-prepare
 
 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'
-    sed -i s/_[0-9]_[0-9]_[0-9]_/_{{ replace(version, '.', '_') }}_/g  docs/src/user/basic_setup.md
-    sed -i 's/[0-9]\.[0-9]\.[0-9]/{{version}}/g'  docs/src/user/basic_setup.md
+    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}}
diff --git a/scripts/release_tag.sh b/scripts/release_tag.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+TAG=${1}
+
+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="<!--youki release begin-->"
+END_MARKER="<!--youki release end-->"
+
+
+echo "\`\`\`console
+\$ 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-${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" '
+BEGIN {printing=1}
+$0 ~ start {print;system("cat " newfile);printing=0}
+$0 ~ end {printing=1}
+printing' docs/src/user/basic_setup.md > temp.txt && mv temp.txt docs/src/user/basic_setup.md
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,3 +22,4 @@ tags.temp
		/test.log

		/tests/k8s/_out/
		replace_content.txt