Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
295 changes: 0 additions & 295 deletions .clang-format

This file was deleted.

5 changes: 0 additions & 5 deletions .github/workflows/bake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ jobs:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Cache Vendor Build
uses: actions/cache@v4
with:
path: vendor/_build
key: ${{ runner.os }}-vendor-build
- name: Set Bake Variables
run: make bake-vars REGISTRY=ghcr.io/clickhouse PG_VERSIONS=${{ matrix.pgv }} >> $GITHUB_ENV
- name: Build${{ startsWith(github.ref, 'refs/tags') && ' and Push' || '' }}
Expand Down
18 changes: 2 additions & 16 deletions .github/workflows/clickhouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
container: pgxn/pgxn-tools
steps:
- name: Start Postgres
run: pg-start ${{ env.pg }} libcurl4-openssl-dev uuid-dev libre2-dev
run: pg-start ${{ env.pg }} libcurl4-openssl-dev uuid-dev liblz4-dev libzstd-dev libre2-dev
- name: Install Extensions
run: pgxn install re2
- name: Checkout the Repository
Expand All @@ -36,19 +36,5 @@ jobs:
- name: Start ClickHouse
env: { CH_RELEASE: "${{ matrix.ch }}" }
run: .github/ubuntu/clickhouse.sh
- name: Cache Dependencies
uses: actions/cache@v5
with:
path: vendor/_build/*
key: vendor-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.git/modules/clickhouse-cpp/refs/heads/master') }}
# Required to prevent clickhouse-cpp from rebuilding because it depends
# on this file in the Makefile. https://github.com/actions/checkout/issues/968
- name: Reset Vendor Timestamp
run: cd vendor/clickhouse-cpp && touch -d $(git log -1 --format="@%ct" CMakeLists.txt) CMakeLists.txt
- name: Test DSO
- name: Test
run: pg-build-test
- name: Clean
run: make clean NO_VENDOR_CLEAN=1
- name: Test Static
run: pg-build-test
env: { CH_BUILD: static }
4 changes: 1 addition & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ jobs:
env: { pg: 18 }
steps:
- name: Install Postgres
run: NO_CLUSTER=1 pg-start ${{ env.pg }} libcurl4-openssl-dev uuid-dev clang-tidy
- name: Install clang-format # version in Ubuntu is too old
run: curl -sLo /usr/local/bin/clang-format https://github.com/cpp-linter/clang-tools-static-binaries/releases/latest/download/clang-format-22_linux-amd64 && chmod +x /usr/local/bin/clang-format
run: NO_CLUSTER=1 pg-start ${{ env.pg }} libcurl4-openssl-dev uuid-dev liblz4-dev libzstd-dev clang-tidy
- name: Checkout the Repository
uses: actions/checkout@v6
- name: Install pre-commit
Expand Down
18 changes: 2 additions & 16 deletions .github/workflows/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,13 @@ jobs:
container: pgxn/pgxn-tools
steps:
- name: Start Postgres ${{ matrix.pg }}
run: pg-start ${{ matrix.pg }} libcurl4-openssl-dev uuid-dev libre2-dev
run: pg-start ${{ matrix.pg }} libcurl4-openssl-dev uuid-dev liblz4-dev libzstd-dev libre2-dev
- name: Install Extensions
run: pgxn install re2
- name: Checkout the Repository
uses: actions/checkout@v6
with: { submodules: true }
- name: Start ClickHouse
run: .github/ubuntu/clickhouse.sh
- name: Cache Dependencies
uses: actions/cache@v5
with:
path: vendor/_build/*
key: vendor-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.git/modules/clickhouse-cpp/refs/heads/master') }}
# Required to prevent clickhouse-cpp from rebuilding because it depends
# on this file in the Makefile. https://github.com/actions/checkout/issues/968
- name: Reset Vendor Timestamp
run: cd vendor/clickhouse-cpp && touch -d $(git log -1 --format="@%ct" CMakeLists.txt) CMakeLists.txt
- name: Test DSO
- name: Test
run: pg-build-test
- name: Clean
run: make clean NO_VENDOR_CLEAN=1
- name: Test Static
run: pg-build-test
env: { CH_BUILD: static }
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Check out the repo
uses: actions/checkout@v6
- name: Start Postgres
run: pg-start 18 libcurl4-openssl-dev uuid-dev
run: pg-start 18 libcurl4-openssl-dev uuid-dev liblz4-dev libzstd-dev
- name: Start ClickHouse
env: { CH_RELEASE: "${{ matrix.ch }}" }
run: .github/ubuntu/clickhouse.sh
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "clickhouse-cpp"]
path = vendor/clickhouse-cpp
url = https://github.com/ClickHouse/clickhouse-cpp.git
[submodule "vendor/clickhouse-c"]
path = vendor/clickhouse-c
url = https://github.com/ClickHouse/clickhouse-c
Loading
Loading