From 7768d515234084af78617179c882fcbf5d81627f Mon Sep 17 00:00:00 2001 From: Matvey Arye Date: Fri, 21 Jun 2024 10:31:51 -0400 Subject: [PATCH] Add arm for pgvectorscale --- build_scripts/shared_install.sh | 9 ++++++--- build_scripts/shared_versions.sh | 2 -- build_scripts/versions.yaml | 1 - cicd/shared.sh | 5 ----- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/build_scripts/shared_install.sh b/build_scripts/shared_install.sh index b3fd9a5d..3dbf697e 100644 --- a/build_scripts/shared_install.sh +++ b/build_scripts/shared_install.sh @@ -245,7 +245,10 @@ __SQL__ } install_pgvectorscale() { - local version="$1" pg pkg=pgvectorscale unsupported_reason + local version="$1" pg pkg=pgvectorscale unsupported_reason arch_deb="$ARCH" + if [ "$arch_deb" = aarch64 ]; then + arch_deb=arm64 + fi for pg in $(available_pg_versions); do unsupported_reason="$(supported_pgvectorscale "$pg" "$version")" @@ -269,10 +272,10 @@ install_pgvectorscale() { --fail \ --location \ --output artifact.zip \ - "https://github.com/timescale/pgvectorscale/releases/download/$version/pgvectorscale-$version-pg${pg}.zip" + "https://github.com/timescale/pgvectorscale/releases/download/$version/pgvectorscale-$version-pg${pg}-${arch_deb}.zip" unzip artifact.zip - dpkg --install --log=/build/pgvectorscale/dpkg.log --admindir=/build/pgvectorscale/ --force-depends --force-not-root --force-overwrite pgvectorscale*amd64.deb + dpkg --install --log=/build/pgvectorscale/dpkg.log --admindir=/build/pgvectorscale/ --force-depends --force-not-root --force-overwrite pgvectorscale*${arch_deb}.deb ) done } \ No newline at end of file diff --git a/build_scripts/shared_versions.sh b/build_scripts/shared_versions.sh index 8fdfa4a3..9373a6c5 100644 --- a/build_scripts/shared_versions.sh +++ b/build_scripts/shared_versions.sh @@ -182,8 +182,6 @@ supported_promscale() { supported_pgvectorscale() { local pg="$1" ver="$2" - if [ "$ARCH" != amd64 ]; then echo "unsupported arch $ARCH"; return; fi - # just attempt the build for main/master/or other branch build if [[ "$ver" = main || "$ver" = master || "$ver" =~ [a-z_-]*/[A-Za-z0-9_-]* ]]; then return diff --git a/build_scripts/versions.yaml b/build_scripts/versions.yaml index 7ef0ed0c..30cf33e8 100644 --- a/build_scripts/versions.yaml +++ b/build_scripts/versions.yaml @@ -188,6 +188,5 @@ toolkit: pgvectorscale: 0.2.0: - arch: amd64 pg-min: 15 pg-max: 16 diff --git a/cicd/shared.sh b/cicd/shared.sh index 8f6735e1..7ba64e23 100644 --- a/cicd/shared.sh +++ b/cicd/shared.sh @@ -201,11 +201,6 @@ check_pgvectorscale() { if [ -z "$PGVECTORSCALE_VERSIONS" ]; then return; fi local pg="$1" lib="$2" found=false - if [ "$ARCH" != amd64 ]; then - # no arm64 pgvectorscale packages - return - fi - # record an empty version so we'll get an empty table row if we don't have any versions record_ext_version pgvectorscale "$pg" ""