Skip to content

Commit

Permalink
Merge branch 'main' into skip-words
Browse files Browse the repository at this point in the history
  • Loading branch information
akuzm authored Jan 30, 2025
2 parents 9b47614 + 538c443 commit fd4b63b
Show file tree
Hide file tree
Showing 179 changed files with 11,144 additions and 1,885 deletions.
17 changes: 14 additions & 3 deletions .github/gh_matrix_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@
"memoize",
}

# Tests that we do not run as part of a Flake tests
flaky_exclude_tests = {
# Not executed as a flake test since it easily exhausts available
# background worker slots.
"bgw_launcher",
# Not executed as a flake test since it takes a very long time and
# easily interferes with other tests.
"bgw_scheduler_restart",
}


# helper functions to generate matrix entries
# the release and apache config inherit from the
Expand Down Expand Up @@ -306,13 +316,14 @@ def macos_config(overrides):
sys.exit(1)

if tests:
to_run = list(tests) * 20
to_run = [t for t in list(tests) if t not in flaky_exclude_tests] * 20
random.shuffle(to_run)
installcheck_args = f'TESTS="{" ".join(to_run)}"'
m["include"].append(
build_debug_config(
{
"coverage": False,
"installcheck_args": f'TESTS="{" ".join(to_run)}"',
"installcheck_args": installcheck_args,
"name": "Flaky Check Debug",
"pg": PG16_LATEST,
"pginstallcheck": False,
Expand All @@ -323,7 +334,7 @@ def macos_config(overrides):
build_debug_config(
{
"coverage": False,
"installcheck_args": f'TESTS="{" ".join(to_run)}"',
"installcheck_args": installcheck_args,
"name": "Flaky Check Debug",
"pg": PG17_LATEST,
"pginstallcheck": False,
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/abi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ name: ABI Test
- trigger/abi
pull_request:
paths: .github/workflows/abi.yaml
workflow_dispatch:
jobs:
config:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/apt-arm-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ name: APT ARM64 packages
branches:
- release_test
- trigger/package_test
workflow_dispatch:
jobs:
apt_tests:
name: APT ARM64 ${{ matrix.image }} PG${{ matrix.pg }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/apt-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ name: APT packages
branches:
- release_test
- trigger/package_test
workflow_dispatch:
jobs:
apt_tests:
name: APT ${{ matrix.image }} PG${{ matrix.pg }} ${{ matrix.license }}
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/catalog-updates-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,15 @@ jobs:
run: |
python scripts/check_updates_ast.py --latest "sql/updates/latest-dev.sql"
- name: Check for idempotency in SQL scripts
if: always()
run: |
python scripts/check_sql_script.py sql/*.sql
# To allow fixing previous mistakes we run the check against reverse-dev but don't
# fail it on errors.
- name: Check reverse-dev contents
if: always()
run: |
python scripts/check_updates_ast.py "sql/updates/reverse-dev.sql" || true
1 change: 1 addition & 0 deletions .github/workflows/coverity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ name: Coverity
push:
branches:
- coverity_scan
workflow_dispatch:
jobs:

coverity:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/docker-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ name: Test Docker images
branches:
- release_test
- trigger/package_test
workflow_dispatch:
jobs:
docker_tests:
name: ${{ matrix.image }}
Expand Down Expand Up @@ -45,7 +46,6 @@ jobs:
"timescaledb-ha:pg15",
"timescaledb-ha:pg16",
"timescaledb-ha:pg17",
"timescaledb:latest-pg17-bitnami",
]

steps:
Expand All @@ -65,7 +65,6 @@ jobs:
echo "version=${version}" >>$GITHUB_OUTPUT
- name: Wait for services to start
# bitnami images have trouble using the docker builtin healthcheck so we are doing it here
run: |
sleep 10
pg_isready -t 30
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/homebrew.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ name: Homebrew
- release_test
- trigger/package_test
- trigger/homebrew_test
workflow_dispatch:

jobs:
homebrew:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/libfuzzer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ name: Libfuzzer
paths:
- .github/workflows/libfuzzer.yaml
- 'tsl/test/fuzzing/compression/**'
workflow_dispatch:

jobs:
build:
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/linux-32bit-build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
if: always() && steps.cache-postgresql.outputs.cache-hit != 'true'
uses: actions/upload-artifact@v4
with:
name: config.log for i386 PostgreSQL ${{ matrix.pg }}
name: config.log linux-i386 PG${{ matrix.pg }}
path: ~/${{ env.PG_SRC_DIR }}/config.log

- name: Build TimescaleDB
Expand All @@ -145,6 +145,18 @@ jobs:
make -C build install
chown -R postgres:postgres .
- name: Upload CMake Logs
if: always()
uses: actions/upload-artifact@v4
with:
name: CMake Logs linux-i386 PG${{ matrix.pg }}
path: |
build/CMakeCache.txt
build/CMakeFiles/CMakeConfigureLog.yaml
build/CMakeFiles/CMakeError.log
build/CMakeFiles/CMakeOutput.log
build/compile_commands.json
- name: make installcheck
id: installcheck
shell: bash
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/linux-build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,18 @@ jobs:
make -j $(nproc) -C build
make -C build install
- name: Upload CMake Logs
if: always()
uses: actions/upload-artifact@v4
with:
name: CMake Logs ${{ matrix.os }} ${{ matrix.name }} ${{ matrix.pg }}
path: |
build/CMakeCache.txt
build/CMakeFiles/CMakeConfigureLog.yaml
build/CMakeFiles/CMakeError.log
build/CMakeFiles/CMakeOutput.log
build/compile_commands.json
- name: Check exported symbols
run: ./build/scripts/export_prefix_check.sh

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release_build_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
GH_TOKEN: ${{ secrets.ORG_AUTOMATION_TOKEN }}
run: |
gh workflow run docker-image.yml -R timescale/timescaledb-docker -f version=${{ github.event.release.tag_name }}
gh workflow run bitnami.yml -R timescale/timescaledb-docker -f version=${{ github.event.release.tag_name }}
gh workflow run timescaledb-debian.yml -R timescale/release-build-scripts -f version=${{ github.event.release.tag_name }} -f upload-artifacts=true
gh workflow run timescaledb-ubuntu.yml -R timescale/release-build-scripts -f version=${{ github.event.release.tag_name }} -f upload-artifacts=true
gh workflow run timescaledb-apt-arm64.yml -R timescale/release-build-scripts -f version=${{ github.event.release.tag_name }} -f upload-artifacts=true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/rpm-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ name: RPM packages
branches:
- release_test
- trigger/package_test
workflow_dispatch:

jobs:
rpm_tests:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sanitizer-build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ name: Sanitizer test
- trigger/sanitizer
pull_request:
paths: .github/workflows/sanitizer-build-and-test.yaml
workflow_dispatch:

env:
name: "Sanitizer"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/snapshot-abi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ name: ABI Test Against Snapshot
- trigger/snapshot-abi
pull_request:
paths: .github/workflows/snapshot-abi.yaml
workflow_dispatch:

jobs:
config:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/update-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ name: Test Update and Downgrade
- main
- prerelease_test
pull_request:
workflow_dispatch:

jobs:
update_test:
name: Update test PG${{ matrix.pg }}
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/windows-build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ name: Regression Windows
- 'LICENSE*'
- NOTICE
- 'bootstrap*'
workflow_dispatch:
jobs:
config:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -245,6 +246,23 @@ jobs:
name: PostgreSQL ${{ matrix.pg }} log ${{ matrix.os }} ${{ matrix.build_type }} Build
path: ${{ env.PGDATA }}\log\postmaster.log

- name: Upload CMake Logs
if: always()
uses: actions/upload-artifact@v4
with:
name: CMake Logs ${{ matrix.pg }} ${{ matrix.os }} ${{ matrix.build_type }}
path: |
build_win/CMakeCache.txt
build_win/CMakeFiles/CMakeConfigureLog.yaml
build_win/CMakeFiles/CMakeError.log
build_win/CMakeFiles/CMakeOutput.log
build_win/compile_commands.json
build_wsl/CMakeCache.txt
build_wsl/CMakeFiles/CMakeConfigureLog.yaml
build_wsl/CMakeFiles/CMakeError.log
build_wsl/CMakeFiles/CMakeOutput.log
build_wsl/compile_commands.json
- name: Upload test results to the database
if: always()
shell: wsl-bash {0}
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/windows-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ name: Windows Packages
branches:
- release_test
- trigger/windows_packages
workflow_dispatch:

jobs:
config:
Expand All @@ -24,6 +25,7 @@ jobs:
pg14_latest: ${{ steps.config.outputs.pg14_latest }}
pg15_latest: ${{ steps.config.outputs.pg15_latest }}
pg16_latest: ${{ steps.config.outputs.pg16_latest }}
pg17_latest: ${{ steps.config.outputs.pg17_latest }}

steps:
- name: Checkout source code
Expand All @@ -40,7 +42,7 @@ jobs:
fail-fast: false
matrix:
os: [ windows-2019 ]
test: [ "14min", "14max", "15min", "15max", "16min", "16max", "17min" ]
test: [ "14min", "14max", "15min", "15max", "16min", "16max", "17min", "17max" ]
include:
- test: 14min
pg: 14
Expand All @@ -63,6 +65,9 @@ jobs:
- test: 17min
pg: 17
pkg_version: ${{ fromJson(needs.config.outputs.pg17_earliest) }}.0
- test: 17max
pg: 17
pkg_version: ${{ fromJson(needs.config.outputs.pg17_latest) }}.0
env:
# PostgreSQL configuration
PGPORT: 6543
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
**/CMakeCache.txt
/sql/tests/unit/testoutputs.tmp
/sql/timescaledb--*.sql
/sql/pre_install/*.gen
/sql/updates/*.gen
/data/
/src/*.o
Expand Down
1 change: 0 additions & 1 deletion .unreleased/pr_6901

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7104

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7271

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7295

This file was deleted.

2 changes: 0 additions & 2 deletions .unreleased/pr_7378

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7390

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7409

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7411

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7412

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7413

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7426

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7432

This file was deleted.

2 changes: 0 additions & 2 deletions .unreleased/pr_7434

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7443

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7455

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7482

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7486

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7488

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7514

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7517

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7557

This file was deleted.

2 changes: 0 additions & 2 deletions .unreleased/pr_7565

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/pr_7584

This file was deleted.

1 change: 1 addition & 0 deletions .unreleased/pr_7600
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixes: #7600 Fix lock order when dropping index
2 changes: 0 additions & 2 deletions .unreleased/resolve-vars

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/vectorized-agg-filter

This file was deleted.

1 change: 0 additions & 1 deletion .unreleased/vectorized-grouping-one-fixed

This file was deleted.

Loading

0 comments on commit fd4b63b

Please sign in to comment.