Prepare scripts for arm64 / aarch64 support (#459)

- GitHub Actions will be adding arm64 support soon
  https://resources.github.com/devops/accelerate-your-cicd-with-arm-and-gpu-runners-in-github-actions/
This commit is contained in:
Lari Hotari 2024-02-15 09:49:15 +02:00 committed by GitHub
parent a1cf2ac6ad
commit ad65ac9941
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 24 deletions

View File

@ -39,6 +39,17 @@ DEFAULT_CHART_TESTING_VERSION=v3.10.1
DEFAULT_YAMLLINT_VERSION=1.33.0 DEFAULT_YAMLLINT_VERSION=1.33.0
DEFAULT_YAMALE_VERSION=4.0.4 DEFAULT_YAMALE_VERSION=4.0.4
ARCH=$(uname -m)
case $ARCH in
x86) ARCH="386";;
x86_64) ARCH="amd64";;
i686) ARCH="386";;
i386) ARCH="386";;
arm64) ARCH="arm64";;
aarch64) ARCH="arm64";;
esac
OS=$(uname|tr '[:upper:]' '[:lower:]')
show_help() { show_help() {
cat << EOF cat << EOF
Usage: $(basename "$0") <options> Usage: $(basename "$0") <options>
@ -109,16 +120,14 @@ install_chart_testing() {
exit 1 exit 1
fi fi
local arch local cache_dir="$RUNNER_TOOL_CACHE/ct/$version/${ARCH}"
arch=$(uname -m)
local cache_dir="$RUNNER_TOOL_CACHE/ct/$version/$arch"
local venv_dir="$cache_dir/venv" local venv_dir="$cache_dir/venv"
if [[ ! -d "$cache_dir" ]]; then if [[ ! -d "$cache_dir" ]]; then
mkdir -p "$cache_dir" mkdir -p "$cache_dir"
echo "Installing chart-testing..." echo "Installing chart-testing..."
curl -sSLo ct.tar.gz "https://github.com/helm/chart-testing/releases/download/$version/chart-testing_${version#v}_linux_amd64.tar.gz" curl -sSLo ct.tar.gz "https://github.com/helm/chart-testing/releases/download/$version/chart-testing_${version#v}_${OS}_${ARCH}.tar.gz"
tar -xzf ct.tar.gz -C "$cache_dir" tar -xzf ct.tar.gz -C "$cache_dir"
rm -f ct.tar.gz rm -f ct.tar.gz
@ -150,4 +159,4 @@ install_chart_testing() {
"$cache_dir/ct" version "$cache_dir/ct" version
} }
main "$@" main "$@"

View File

@ -47,11 +47,13 @@ hack::discoverArch() {
x86_64) ARCH="amd64";; x86_64) ARCH="amd64";;
i686) ARCH="386";; i686) ARCH="386";;
i386) ARCH="386";; i386) ARCH="386";;
arm64) ARCH="arm64";;
aarch64) ARCH="arm64";;
esac esac
} }
hack::discoverArch hack::discoverArch
OS=$(echo `uname`|tr '[:upper:]' '[:lower:]') OS=$(uname|tr '[:upper:]' '[:lower:]')
function hack::verify_kubectl() { function hack::verify_kubectl() {
if test -x "$KUBECTL_BIN"; then if test -x "$KUBECTL_BIN"; then
@ -105,7 +107,7 @@ function hack::ensure_kind() {
echo "Installing kind v$KIND_VERSION..." echo "Installing kind v$KIND_VERSION..."
tmpfile=$(mktemp) tmpfile=$(mktemp)
trap "test -f $tmpfile && rm $tmpfile" RETURN trap "test -f $tmpfile && rm $tmpfile" RETURN
curl --retry 10 -L -o $tmpfile https://github.com/kubernetes-sigs/kind/releases/download/v${KIND_VERSION}/kind-$(uname)-amd64 curl --retry 10 -L -o $tmpfile https://github.com/kubernetes-sigs/kind/releases/download/v${KIND_VERSION}/kind-${OS}-${ARCH}
mv $tmpfile $KIND_BIN mv $tmpfile $KIND_BIN
chmod +x $KIND_BIN chmod +x $KIND_BIN
} }

View File

@ -29,20 +29,6 @@ PULSARCTL_VERSION=v3.0.2.6
PULSARCTL_BIN=${HOME}/.pulsarctl/pulsarctl PULSARCTL_BIN=${HOME}/.pulsarctl/pulsarctl
export PATH=${HOME}/.pulsarctl/plugins:${PATH} export PATH=${HOME}/.pulsarctl/plugins:${PATH}
discoverArch() {
ARCH=$(uname -m)
case $ARCH in
x86) ARCH="386";;
x86_64) ARCH="amd64";;
i686) ARCH="386";;
i386) ARCH="386";;
arm64) ARCH="arm64";;
esac
}
discoverArch
OS=$(echo `uname`|tr '[:upper:]' '[:lower:]')
test -d "$OUTPUT_BIN" || mkdir -p "$OUTPUT_BIN" test -d "$OUTPUT_BIN" || mkdir -p "$OUTPUT_BIN"
function pulsar::verify_pulsarctl() { function pulsar::verify_pulsarctl() {
@ -62,6 +48,4 @@ function pulsar::ensure_pulsarctl() {
curl --retry 10 -L -o $install_script https://raw.githubusercontent.com/streamnative/pulsarctl/master/install.sh curl --retry 10 -L -o $install_script https://raw.githubusercontent.com/streamnative/pulsarctl/master/install.sh
chmod +x $install_script chmod +x $install_script
$install_script --user --version ${PULSARCTL_VERSION} $install_script --user --version ${PULSARCTL_VERSION}
} }