Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs(main): support arm64 release docs #2510

Merged
merged 3 commits into from
Nov 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ jobs:
files: |
./${{ env.OUTPUTDIR }}-x86_64.tar.gz
./${{ env.OUTPUTDIR }}-aarch64.tar.gz

publish:
name: Publish Packages
needs: build
Expand Down
1 change: 1 addition & 0 deletions .gitignore
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
2 changes: 1 addition & 1 deletion crates/libcontainer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions crates/youki/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand All @@ -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"] }
10 changes: 6 additions & 4 deletions docs/src/user/basic_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
31 changes: 31 additions & 0 deletions scripts/release_tag.sh
Original file line number Diff line number Diff line change
@@ -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