Fix merge issues

timescale · Sep 1, 2023 · d10a02a · d10a02a
1 parent 70c91e6
commit d10a02a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/build_scripts/shared_versions.sh b/build_scripts/shared_versions.sh
@@ -30,9 +30,9 @@ else
 fi
 
 DEFAULT_PG_MIN="$(yq .default-pg-min <<< "$VERSION_DATA")"
-[ -z "$DEFAULT_PG_MIN" ] && { error "default-pg-min required in versions.yaml"; exit 1; }
+[ -z "$DEFAULT_PG_MIN" ] && { error "default-pg-min is required in versions.yaml"; exit 1; }
 DEFAULT_PG_MAX="$(yq .default-pg-max <<< "$VERSION_DATA")"
-[ -z "$DEFAULT_PG_MAX" ] && { error "default-pg-max required in versions.yaml"; exit 1; }
+[ -z "$DEFAULT_PG_MAX" ] && { error "default-pg-max is required in versions.yaml"; exit 1; }
 
 pkg_versions() {
     local pkg="$1"
@@ -109,6 +109,7 @@ install_rust_extensions() {
 }
 
 version_is_supported() {
+    local pkg="$1" pg="$2" ver="$3" pdata pgmin pgmax arch
     local -a pgversions
 
     pdata="$(yq ".$pkg | pick([\"$ver\"]) | .[]" <<<"$VERSION_DATA")"
@@ -118,7 +119,7 @@ version_is_supported() {
     fi
 
     arch="$(yq .arch <<<"$pdata")"
-    if [ "$arch" = null ]; then arch="$DEFAULT_ARCH"; fi
+    if [ "$arch" = null ]; then arch="both"; fi
     if [[ "$arch" != "both" && "$arch" != "$ARCH" ]]; then echo "unsupported arch $ARCH"; return; fi
 
     pgmin="$(yq .pg-min <<<"$pdata")"

diff --git a/build_scripts/versions.yaml b/build_scripts/versions.yaml
@@ -20,8 +20,6 @@
 
 default-pg-min: 12
 default-pg-max: 15
-default-cargo-pgx: 0.6.1
-default-arch: both
 
 timescaledb:
   1.7.5: