From 2d33a914d8f55e56788bf4b4e885bc30647eda6e Mon Sep 17 00:00:00 2001 From: wangfei Date: Thu, 8 Dec 2022 11:02:30 +0800 Subject: [PATCH] optimize rootfs scripts --- .github/workflows/auto-build.yml | 2 +- auto-build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index b670e3f..529cd3e 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -18,7 +18,7 @@ jobs: commentbody="${{github.event.comment.body}}" commentbody=$(echo $commentbody | sed "s/\/imagebuild//g") sudo git clone https://github.com/sealerio/basefs.git && cd basefs - sudo touch autobuild.log && sudo chmod 666 autobuild.log && sudo bash auto-build.sh --username="${{secrets.REGISTRY_USERNAME}}" --password="${{secrets.REGISTRY_PASSWORD}}" $commentbody > autobuild.log && cat autobuild.log + sudo touch autobuild.log && sudo chmod 666 autobuild.log && sudo bash auto.sh --username="${{secrets.REGISTRY_USERNAME}}" --password="${{secrets.REGISTRY_PASSWORD}}" $commentbody > autobuild.log && cat autobuild.log echo "::set-output name=info::$(grep 'cri:' autobuild.log))" - name: Success Commit diff --git a/auto-build.sh b/auto-build.sh index 722a5fc..2991f7e 100644 --- a/auto-build.sh +++ b/auto-build.sh @@ -63,7 +63,7 @@ for i in "$@"; do esac done -version_compare() { printf '%s\n%s\n' "$2" "$1" | sort -V -C; } ## version_vompare $a $b: a>=b +version_compare() { printf '%s\n%s\n' "$2" "$1" | sort -V -C; } ## version_compare $a $b: a>=b ARCH=$(case "$(uname -m)" in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo "unsupported architecture" "$(uname -m)" && exit 1 ;; esac)