Skip to content

Commit c049edd

Browse files
authored
Merge branch 'main' into allow_custom_uda_name
2 parents db3be1a + 2a3d5d9 commit c049edd

File tree

87 files changed

+1154
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1154
-284
lines changed

.github/workflows/apt-arm-packages.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ jobs:
7070
id: versions
7171
run: |
7272
# read expected version from version.config
73-
# version will only be a proper version in a release branch so we use update_from_version
73+
# version will only be a proper version in a release branch so we use previous_version
7474
# as fallback for main
7575
if grep '^version = [0-9.]\+$' version.config; then
7676
version=$(grep '^version = ' version.config | sed -e 's!^version = !!')
7777
else
78-
version=$(grep '^update_from_version = ' version.config | sed -e 's!^update_from_version = !!')
78+
version=$(grep '^previous_version = ' version.config | sed -e 's!^previous_version = !!')
7979
fi
8080
echo "version=${version}" >>$GITHUB_OUTPUT
8181

.github/workflows/apt-packages.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ jobs:
6464
id: versions
6565
run: |
6666
# read expected version from version.config
67-
# version will only be a proper version in a release branch so we use update_from_version
67+
# version will only be a proper version in a release branch so we use previous_version
6868
# as fallback for main
6969
if grep '^version = [0-9.]\+$' version.config; then
7070
version=$(grep '^version = ' version.config | sed -e 's!^version = !!')
7171
else
72-
version=$(grep '^update_from_version = ' version.config | sed -e 's!^update_from_version = !!')
72+
version=$(grep '^previous_version = ' version.config | sed -e 's!^previous_version = !!')
7373
fi
7474
echo "version=${version}" >>$GITHUB_OUTPUT
7575

.github/workflows/docker-images.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ jobs:
5353
id: versions
5454
run: |
5555
# read expected version from version.config
56-
# version will only be a proper version in a release branch so we use update_from_version
56+
# version will only be a proper version in a release branch so we use previous_version
5757
# as fallback for main
5858
if grep '^version = [0-9.]\+$' version.config; then
5959
version=$(grep '^version = ' version.config | sed -e 's!^version = !!')
6060
else
61-
version=$(grep '^update_from_version = ' version.config | sed -e 's!^update_from_version = !!')
61+
version=$(grep '^previous_version = ' version.config | sed -e 's!^previous_version = !!')
6262
fi
6363
echo "version=${version}" >>$GITHUB_OUTPUT
6464

.github/workflows/homebrew.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
if grep '^version = [0-9.]\+$' version.config; then
5353
version=$(grep '^version = ' version.config | sed -e 's!^version = !!')
5454
else
55-
version=$(grep '^update_from_version = ' version.config | sed -e 's!^update_from_version = !!')
55+
version=$(grep '^previous_version = ' version.config | sed -e 's!^previous_version = !!')
5656
fi
5757
installed_version=$(psql -X -t \
5858
-c "SELECT extversion FROM pg_extension WHERE extname='timescaledb';" \

.github/workflows/pg_ladybug.yaml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: pg_ladybug
2+
"on":
3+
pull_request:
4+
push:
5+
branches:
6+
- main
7+
- prerelease_test
8+
jobs:
9+
pg_ladybug:
10+
runs-on: ubuntu-latest
11+
env:
12+
CC: clang-19
13+
CXX: clang++-19
14+
LLVM_CONFIG: llvm-config-19
15+
16+
steps:
17+
18+
- name: Install dependencies
19+
run: |
20+
sudo apt-get update
21+
sudo apt-get purge llvm-16 llvm-18 clang-16 clang-18
22+
sudo apt-get install llvm-19 llvm-19-dev clang-19 libclang-19-dev clang-tidy-19 libcurl4-openssl-dev postgresql-server-dev-16
23+
sudo ln -sf /usr/bin/clang-tidy-19 /usr/bin/clang-tidy
24+
25+
- name: Checkout timescaledb
26+
uses: actions/checkout@v4
27+
28+
- name: Checkout pg_ladybug
29+
uses: actions/checkout@v4
30+
with:
31+
repository: 'timescale/pg_ladybug'
32+
path: 'pg_ladybug'
33+
ref: '0.1.0'
34+
35+
- name: build pg_ladybug
36+
run: |
37+
cd pg_ladybug
38+
cmake -S . -B build
39+
make -C build
40+
sudo make -C build install
41+
42+
- name: Verify pg_ladybug
43+
run: |
44+
clang-tidy --load /usr/local/lib/libPostgresCheck.so --checks='-*,postgres-*' --list-checks | grep postgres
45+
46+
- name: Configure timescaledb
47+
run: |
48+
./bootstrap -DCMAKE_BUILD_TYPE=Debug -DLINTER=ON -DCLANG_TIDY_EXTRA_OPTS=",-*,postgres-*;--load=/usr/local/lib/libPostgresCheck.so"
49+
50+
- name: Build timescaledb
51+
run: |
52+
make -C build
53+

.github/workflows/pgspot.yaml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,10 @@ jobs:
5353
5454
- name: Build timescaledb sqlfiles
5555
run: |
56-
downgrade_to=$(grep '^downgrade_to_version = ' version.config | sed -e 's!^[^=]\+ = !!')
56+
previous_version=$(grep '^previous_version = ' version.config | sed -e 's!^[^=]\+ = !!')
5757
git fetch --tags
5858
./bootstrap -DGENERATE_DOWNGRADE_SCRIPT=ON
59-
# We use downgrade_to_version instead of update_from_version because
60-
# when the release PR for a new version has been merged to main but
61-
# the version is not tagged yet update_from_version will not exist yet.
62-
# In all other situations update_from_version and downgrade_to_version
63-
# should point to the same version.
64-
git checkout ${downgrade_to}
59+
git checkout ${previous_version}
6560
make -C build sqlfile sqlupdatescripts
6661
git checkout ${GITHUB_SHA}
6762
make -C build sqlfile sqlupdatescripts
@@ -70,19 +65,19 @@ jobs:
7065
- name: Run pgspot
7166
run: |
7267
version=$(grep '^version = ' version.config | sed -e 's!^[^=]\+ = !!')
73-
downgrade_to=$(grep '^downgrade_to_version = ' version.config | sed -e 's!^[^=]\+ = !!')
68+
previous_version=$(grep '^previous_version = ' version.config | sed -e 's!^[^=]\+ = !!')
7469
7570
# Show files used
76-
ls -la build/sql/timescaledb--${version}.sql build/sql/timescaledb--${downgrade_to}--${version}.sql \
77-
build/sql/timescaledb--${version}--${downgrade_to}.sql
71+
ls -la build/sql/timescaledb--${version}.sql build/sql/timescaledb--${previous_version}--${version}.sql \
72+
build/sql/timescaledb--${version}--${previous_version}.sql
7873
7974
# The next pgspot execution tests the installation script by itself
8075
pgspot ${{ env.PGSPOT_OPTS }} build/sql/timescaledb--${version}.sql
8176
# The next pgspot execution tests the update script to the latest version
8277
# we prepend the installation script here so pgspot can correctly keep track of created objects
83-
pgspot ${{ env.PGSPOT_OPTS }} -a build/sql/timescaledb--${downgrade_to}.sql \
84-
build/sql/timescaledb--${downgrade_to}--${version}.sql
78+
pgspot ${{ env.PGSPOT_OPTS }} -a build/sql/timescaledb--${previous_version}.sql \
79+
build/sql/timescaledb--${previous_version}--${version}.sql
8580
# The next pgspot execution tests the downgrade script to the previous version
8681
# we prepend the installation script here so pgspot can correctly keep track of created objects
8782
pgspot ${{ env.PGSPOT_OPTS }} -a build/sql/timescaledb--${version}.sql \
88-
build/sql/timescaledb--${version}--${downgrade_to}.sql
83+
build/sql/timescaledb--${version}--${previous_version}.sql

.github/workflows/rpm-packages.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ jobs:
7171
id: versions
7272
run: |
7373
# read expected version from version.config
74-
# version will only be a proper version in a release branch so we use update_from_version
74+
# version will only be a proper version in a release branch so we use previous_version
7575
# as fallback for main
7676
if grep '^version = [0-9.]\+$' version.config; then
7777
version=$(grep '^version = ' version.config | sed -e 's!^version = !!')
7878
else
79-
version=$(grep '^update_from_version = ' version.config | sed -e 's!^update_from_version = !!')
79+
version=$(grep '^previous_version = ' version.config | sed -e 's!^previous_version = !!')
8080
fi
8181
echo "version=${version}" >>$GITHUB_OUTPUT
8282

.github/workflows/windows-packages.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ jobs:
5757
- name: Get version
5858
id: version
5959
run: |
60-
# version will only be a proper version in a release branch so we use update_from_version
60+
# version will only be a proper version in a release branch so we use previous_version
6161
# as fallback for main
6262
if (grep '^version = [0-9.]\+$' version.config)
6363
{
6464
$version=sed -n 's!^version = !!p' version.config
6565
} else {
66-
$version=sed -n 's!^update_from_version = !!p' version.config
66+
$version=sed -n 's!^previous_version = !!p' version.config
6767
}
6868
cat version.config
6969
echo "Determined version: "

.unreleased/pr_7880

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Implements: #7880 Add experimental support for window functions in caggs

.unreleased/pr_7912

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixes: #7912 Don't capture errors estimating time max spread

0 commit comments

Comments
 (0)