Merge branch 'ch-24.3' of github.com:PostHog/posthog into ch-24.3

PostHog · Nov 7, 2024 · 109f0c4 · 109f0c4
2 parents 6b5bf4b + ef475a2
commit 109f0c4
Show file tree

Hide file tree

Showing 58 changed files with 378 additions and 4,626 deletions.
diff --git a/.github/actions/run-backend-tests/action.yml b/.github/actions/run-backend-tests/action.yml
@@ -210,7 +210,7 @@ runs:
 
         - name: Upload updated timing data as artifacts
           uses: actions/upload-artifact@v4
-          if: ${{ inputs.person-on-events != 'true' && inputs.clickhouse-server-image == 'clickhouse/clickhouse-server:23.12.6.19' }}
+          if: ${{ inputs.person-on-events != 'true' && inputs.clickhouse-server-image == 'clickhouse/clickhouse-server:24.8.5.115' }}
           with:
               name: timing_data-${{ inputs.segment }}-${{ inputs.group }}
               path: .test_durations

diff --git a/.github/workflows/ci-backend-update-test-timing.yml b/.github/workflows/ci-backend-update-test-timing.yml
@@ -29,13 +29,13 @@ jobs:
                   group: 1
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
                   python-version: '3.11.9'
-                  clickhouse-server-image: 'clickhouse/clickhouse-server:23.12.6.19'
+                  clickhouse-server-image: 'clickhouse/clickhouse-server:24.8.5.115'
                   segment: 'FOSS'
                   person-on-events: false
 
             - name: Upload updated timing data as artifacts
               uses: actions/upload-artifact@v4
-              if: ${{ inputs.person-on-events != 'true' && inputs.clickhouse-server-image == 'clickhouse/clickhouse-server:23.12.6.19' }}
+              if: ${{ inputs.person-on-events != 'true' && inputs.clickhouse-server-image == 'clickhouse/clickhouse-server:24.8.5.115' }}
               with:
                   name: timing_data-${{ inputs.segment }}-${{ inputs.group }}
                   path: .test_durations

diff --git a/.github/workflows/ci-backend.yml b/.github/workflows/ci-backend.yml
@@ -234,7 +234,8 @@ jobs:
             fail-fast: false
             matrix:
                 python-version: ['3.11.9']
-                clickhouse-server-image: ['clickhouse/clickhouse-server:23.12.6.19']
+                clickhouse-server-image:
+                    ['clickhouse/clickhouse-server:23.12.6.19', 'clickhouse/clickhouse-server:24.8.5.115']
                 segment: ['Core']
                 person-on-events: [false, true]
                 # :NOTE: Keep concurrency and groups in sync
@@ -243,7 +244,7 @@ jobs:
                 include:
                     - segment: 'Temporal'
                       person-on-events: false
-                      clickhouse-server-image: 'clickhouse/clickhouse-server:23.12.6.19'
+                      clickhouse-server-image: 'clickhouse/clickhouse-server:24.8.5.115'
                       python-version: '3.11.9'
                       concurrency: 3
                       group: 1
@@ -326,7 +327,8 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                clickhouse-server-image: ['clickhouse/clickhouse-server:23.12.6.19']
+                clickhouse-server-image:
+                    ['clickhouse/clickhouse-server:23.12.6.19', 'clickhouse/clickhouse-server:24.8.5.115']
         if: needs.changes.outputs.backend == 'true'
         runs-on: ubuntu-latest
         steps:

diff --git a/docker-compose.base.yml b/docker-compose.base.yml
@@ -79,7 +79,7 @@ services:
         # Note: please keep the default version in sync across
         #       `posthog` and the `charts-clickhouse` repos
         #
-        image: ${CLICKHOUSE_SERVER_IMAGE:-clickhouse/clickhouse-server:23.12.6.19}
+        image: ${CLICKHOUSE_SERVER_IMAGE:-clickhouse/clickhouse-server:24.8.5.115}
         restart: on-failure
 
     zookeeper:

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -57,6 +57,7 @@ services:
             service: clickhouse
         ports:
             - '8123:8123'
+            - '8443:8443'
             - '9000:9000'
             - '9440:9440'
             - '9009:9009'