From b24e7d514879d5ec14096eb0fb8b6ec7cbf85675 Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Sun, 19 Jun 2022 20:29:27 -0400 Subject: [PATCH] add 386, arm, and arm64 to ubuntu buildscripts current use of 64 and 32 in github actions is unaffected and will function as before added arm, and arm64 as acceptable TARGET_ARCH options --- dependencies.json | 18 ++++++++++++++++++ script/build-ubuntu.sh | 13 +++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dependencies.json b/dependencies.json index 3228a6a2..7be05be0 100644 --- a/dependencies.json +++ b/dependencies.json @@ -27,6 +27,24 @@ "name": "git-lfs-linux-amd64-v3.1.4.tar.gz", "checksum": "f97f3e40261d872a246f6fb2c96adf132f96c1428f70b4d0e5a644f98481fb76" }, + { + "platform": "linux", + "arch": "386", + "name": "git-lfs-linux-386-v3.1.4.tar.gz", + "checksum": "1ded175d5aa307f01080fb5ba84ae0ab75665adc933cb1f8178cbbde537a5595" + }, + { + "platform": "linux", + "arch": "arm64", + "name": "git-lfs-linux-arm64-v3.1.4.tar.gz", + "checksum": "c44b4070693f2e8eface24b6b2d5915e6cb1a6dd243e8c1cfcaa72ffe702ee56" + }, + { + "platform": "linux", + "arch": "arm", + "name": "git-lfs-linux-arm-v3.1.4.tar.gz", + "checksum": "bc4026580aa9efbdfabd4361b8739ace02364245a9797988a875fe2b1c17d376" + }, { "platform": "windows", "arch": "x86", diff --git a/script/build-ubuntu.sh b/script/build-ubuntu.sh index 85e36cac..51e36b9d 100755 --- a/script/build-ubuntu.sh +++ b/script/build-ubuntu.sh @@ -20,11 +20,12 @@ if [[ -z "${CURL_INSTALL_DIR}" ]]; then exit 1 fi -if [ "$TARGET_ARCH" = "64" ]; then - DEPENDENCY_ARCH="amd64" -else - DEPENDENCY_ARCH="x86" -fi +case "$TARGET_ARCH" in + "64") DEPENDENCY_ARCH="amd64" ;; + "arm64") DEPENDENCY_ARCH="arm64" ;; + "arm") DEPENDENCY_ARCH="arm" ;; + *) DEPENDENCY_ARCH="386" ;; +esac CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" GIT_LFS_VERSION="$(jq --raw-output '.["git-lfs"].version[1:]' dependencies.json)" @@ -72,7 +73,7 @@ DESTDIR="$DESTINATION" \ if [[ "$GIT_LFS_VERSION" ]]; then echo "-- Bundling Git LFS" GIT_LFS_FILE=git-lfs.tar.gz - GIT_LFS_URL="https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/git-lfs-linux-amd64-v${GIT_LFS_VERSION}.tar.gz" + GIT_LFS_URL="https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/git-lfs-linux-${DEPENDENCY_ARCH}-v${GIT_LFS_VERSION}.tar.gz" echo "-- Downloading from $GIT_LFS_URL" curl -sL -o $GIT_LFS_FILE "$GIT_LFS_URL" COMPUTED_SHA256=$(compute_checksum $GIT_LFS_FILE)