Skip to content

Commit 3c1c292

Browse files
committed
fix: use major.minor version for deb package suffix
Make use of the major.minor versions pinned in versions.yaml file for the deb package suffix.
1 parent 9d6bc00 commit 3c1c292

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

build_scripts/pg_version.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
#!/bin/bash
22

3+
SCRIPT_DIR="${BASH_SOURCE[0]%/*}"
4+
35
MAJOR="${1}"
46
if [ -z "${MAJOR}" ]; then
57
echo "missing major version"
68
exit 2
79
fi
810

9-
PINNED=$(yq ".postgres_versions.${MAJOR}" /build/scripts/versions.yaml)
11+
PINNED=$(yq ".postgres_versions[\"${MAJOR}\"]" "$SCRIPT_DIR/versions.yaml")
1012
if [ "${PINNED}" = "null" ]; then
1113
echo "could not find ${MAJOR} pinned version"
1214
exit 2

build_scripts/shared_install.sh

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,12 @@ ensure_packagecloud_repo() {
5959
install_timescaledb_for_pg_version() {
6060
local pg_version=$1
6161
local ts_version=$2
62+
local pg_full_suffix=$3
6263
local package_suffix
6364
local loader_package
6465
local main_package
6566

66-
package_suffix=$(get_package_suffix "${ts_version}")
67+
package_suffix=$(get_package_suffix "${ts_version}")-"${pg_full_suffix}"
6768
log "package suffix: ${package_suffix}"
6869

6970
# construct package names
@@ -88,6 +89,15 @@ install_timescaledb_for_pg_version() {
8889
log "successfully installed TimescaleDB ${ts_version} for PostgreSQL ${pg_version}"
8990
}
9091

92+
# 18.1 -> 1801
93+
# 18.10 -> 1810
94+
format_pg_major_minor_version() {
95+
local pg_version=$1
96+
local major="${pg_version%%.*}"
97+
local minor="${pg_version#*.}"
98+
echo $((major * 100 + minor))
99+
}
100+
91101
install_timescaledb() {
92102
local version="$1" pg pkg=timescaledb unsupported_reason oss_only=""
93103
[ "$OSS_ONLY" = true ] && oss_only="-DAPACHE_ONLY=1"
@@ -122,6 +132,9 @@ install_timescaledb() {
122132
continue
123133
fi
124134

135+
pg_full_version=$("$SCRIPT_DIR/pg_version.sh" "${pg}")
136+
pg_full_suffix=$(format_pg_major_minor_version "${pg_full_version}")
137+
125138
log "installing $pkg-$version for pg$pg"
126139

127140
[[ "$DRYRUN" = true ]] && continue
@@ -131,7 +144,7 @@ install_timescaledb() {
131144
if [[ "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]] && [ "$(printf '%s\n' "$version" "2.24.0" | sort -V | tail -n1)" = "$version" ]; then
132145
log "installing deb package for $pkg-$version for pg$pg"
133146

134-
install_timescaledb_for_pg_version "${pg}" "${version}"
147+
install_timescaledb_for_pg_version "${pg}" "${version}" "${pg_full_suffix}"
135148
err=$?
136149

137150
if [ $err -eq 0 ]; then

0 commit comments

Comments
 (0)