From d10a02a8a26e00c478592a58dfdd95e3a978c4e8 Mon Sep 17 00:00:00 2001
From: Brent Graveland <brent@timescale.com>
Date: Mon, 10 Jul 2023 09:51:55 -0600
Subject: [PATCH] Fix merge issues

---
 build_scripts/shared_versions.sh | 7 ++++---
 build_scripts/versions.yaml      | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build_scripts/shared_versions.sh b/build_scripts/shared_versions.sh
index d494b85f..fc36ce07 100644
--- 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
index da73f02b..795c9705 100644
--- 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: