Skip to content

Commit 81889f4

Browse files
oliverb123oliverb123
authored
Merge branch 'master' into distributed-embedding-table
2 parents f2eca27 + 82628eb commit 81889f4

File tree

306 files changed

+8032
-3766
lines changed

Some content is hidden

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

306 files changed

+8032
-3766
lines changed

‎.dockerignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
!test-runner-jest.config.js
5151
!tsconfig.json
5252
!unit.json.tpl
53-
ee/frontend/node_modules
5453
common/*/*/node_modules
5554
common/*/node_modules
5655
common/*/*/dist

‎.github/actions/run-backend-tests/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ runs:
238238

239239
- name: Upload updated timing data as artifacts
240240
uses: actions/upload-artifact@v4
241-
if: ${{ inputs.person-on-events != 'true' && inputs.clickhouse-server-image == 'clickhouse/clickhouse-server:25.8.11.66' }}
241+
if: ${{ inputs.person-on-events != 'true' && inputs.clickhouse-server-image == 'clickhouse/clickhouse-server:25.8.12.129' }}
242242
with:
243243
name: timing_data-${{ inputs.segment }}-${{ inputs.group }}
244244
path: .test_durations

‎.github/workflows/ci-backend-update-test-timing.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ jobs:
2929
group: 1
3030
token: ${{ secrets.POSTHOG_BOT_PAT }}
3131
python-version: '3.12.12'
32-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
32+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
3333
segment: 'FOSS'
3434
person-on-events: false
3535

3636
- name: Upload updated timing data as artifacts
3737
uses: actions/upload-artifact@v4
38-
if: ${{ inputs.person-on-events != 'true' && inputs.clickhouse-server-image == 'clickhouse/clickhouse-server:25.8.11.66' }}
38+
if: ${{ inputs.person-on-events != 'true' && inputs.clickhouse-server-image == 'clickhouse/clickhouse-server:25.8.12.129' }}
3939
with:
4040
name: timing_data-${{ inputs.segment }}-${{ inputs.group }}
4141
path: .test_durations

‎.github/workflows/ci-backend.yml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ jobs:
390390
fail-fast: false
391391
matrix:
392392
python-version: ['3.12.12']
393-
clickhouse-server-image: ['clickhouse/clickhouse-server:25.8.11.66']
393+
clickhouse-server-image: ['clickhouse/clickhouse-server:25.8.12.129']
394394
segment: ['Core']
395395
person-on-events: [false]
396396
# :NOTE: Keep concurrency and groups in sync
@@ -441,121 +441,121 @@ jobs:
441441
include:
442442
- segment: 'Core'
443443
person-on-events: true
444-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
444+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
445445
python-version: '3.12.12'
446446
concurrency: 10
447447
group: 1
448448
- segment: 'Core'
449449
person-on-events: true
450-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
450+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
451451
python-version: '3.12.12'
452452
concurrency: 10
453453
group: 2
454454
- segment: 'Core'
455455
person-on-events: true
456-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
456+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
457457
python-version: '3.12.12'
458458
concurrency: 10
459459
group: 3
460460
- segment: 'Core'
461461
person-on-events: true
462-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
462+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
463463
python-version: '3.12.12'
464464
concurrency: 10
465465
group: 4
466466
- segment: 'Core'
467467
person-on-events: true
468-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
468+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
469469
python-version: '3.12.12'
470470
concurrency: 10
471471
group: 5
472472
- segment: 'Core'
473473
person-on-events: true
474-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
474+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
475475
python-version: '3.12.12'
476476
concurrency: 10
477477
group: 6
478478
- segment: 'Core'
479479
person-on-events: true
480-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
480+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
481481
python-version: '3.12.12'
482482
concurrency: 10
483483
group: 7
484484
- segment: 'Core'
485485
person-on-events: true
486-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
486+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
487487
python-version: '3.12.12'
488488
concurrency: 10
489489
group: 8
490490
- segment: 'Core'
491491
person-on-events: true
492-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
492+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
493493
python-version: '3.12.12'
494494
concurrency: 10
495495
group: 9
496496
- segment: 'Core'
497497
person-on-events: true
498-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
498+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
499499
python-version: '3.12.12'
500500
concurrency: 10
501501
group: 10
502502
- segment: 'Temporal'
503503
person-on-events: false
504-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
504+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
505505
python-version: '3.12.12'
506506
concurrency: 10
507507
group: 1
508508
- segment: 'Temporal'
509509
person-on-events: false
510-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
510+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
511511
python-version: '3.12.12'
512512
concurrency: 10
513513
group: 2
514514
- segment: 'Temporal'
515515
person-on-events: false
516-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
516+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
517517
python-version: '3.12.12'
518518
concurrency: 10
519519
group: 3
520520
- segment: 'Temporal'
521521
person-on-events: false
522-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
522+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
523523
python-version: '3.12.12'
524524
concurrency: 10
525525
group: 4
526526
- segment: 'Temporal'
527527
person-on-events: false
528-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
528+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
529529
python-version: '3.12.12'
530530
concurrency: 10
531531
group: 5
532532
- segment: 'Temporal'
533533
person-on-events: false
534-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
534+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
535535
python-version: '3.12.12'
536536
concurrency: 10
537537
group: 6
538538
- segment: 'Temporal'
539539
person-on-events: false
540-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
540+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
541541
python-version: '3.12.12'
542542
concurrency: 10
543543
group: 7
544544
- segment: 'Temporal'
545545
person-on-events: false
546-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
546+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
547547
python-version: '3.12.12'
548548
concurrency: 10
549549
group: 8
550550
- segment: 'Temporal'
551551
person-on-events: false
552-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
552+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
553553
python-version: '3.12.12'
554554
concurrency: 10
555555
group: 9
556556
- segment: 'Temporal'
557557
person-on-events: false
558-
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.11.66'
558+
clickhouse-server-image: 'clickhouse/clickhouse-server:25.8.12.129'
559559
python-version: '3.12.12'
560560
concurrency: 10
561561
group: 10
@@ -839,7 +839,7 @@ jobs:
839839

840840
- name: Upload updated timing data as artifacts
841841
uses: actions/upload-artifact@v4
842-
if: ${{ needs.changes.outputs.backend == 'true' && !matrix.person-on-events && matrix.clickhouse-server-image == 'clickhouse/clickhouse-server:25.8.11.66' }}
842+
if: ${{ needs.changes.outputs.backend == 'true' && !matrix.person-on-events && matrix.clickhouse-server-image == 'clickhouse/clickhouse-server:25.8.12.129' }}
843843
with:
844844
name: timing_data-${{ matrix.segment }}-${{ matrix.group }}
845845
path: .test_durations
@@ -924,7 +924,7 @@ jobs:
924924
strategy:
925925
fail-fast: false
926926
matrix:
927-
clickhouse-server-image: ['clickhouse/clickhouse-server:25.8.11.66']
927+
clickhouse-server-image: ['clickhouse/clickhouse-server:25.8.12.129']
928928
if: needs.changes.outputs.backend == 'true'
929929
runs-on: ubuntu-latest
930930
steps:

‎.github/workflows/ci-dagster.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
strategy:
6666
fail-fast: false
6767
matrix:
68-
clickhouse-server-image: ['clickhouse/clickhouse-server:25.8.11.66']
68+
clickhouse-server-image: ['clickhouse/clickhouse-server:25.8.12.129']
6969
if: needs.changes.outputs.dagster == 'true'
7070
runs-on: depot-ubuntu-latest
7171
steps:

‎.github/workflows/ci-e2e-playwright.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
- name: Stop/Start stack with Docker Compose
142142
shell: bash
143143
run: |
144-
export CLICKHOUSE_SERVER_IMAGE=clickhouse/clickhouse-server:25.8.11.66
144+
export CLICKHOUSE_SERVER_IMAGE=clickhouse/clickhouse-server:25.8.12.129
145145
export DOCKER_REGISTRY_PREFIX="us-east1-docker.pkg.dev/posthog-301601/mirror/"
146146
cp posthog/user_scripts/latest_user_defined_function.xml docker/clickhouse/user_defined_function.xml
147147

‎.github/workflows/ci-frontend.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ jobs:
212212
run: pnpm --filter=@posthog/frontend schema:build:json && git diff --exit-code
213213

214214
- name: Check if mobile replay "schema.json" is up to date
215-
run: pnpm --filter=@posthog/ee mobile-replay:schema:build:json && git diff --exit-code
215+
run: pnpm --filter=@posthog/frontend mobile-replay:schema:build:json && git diff --exit-code
216216

217217
jest:
218218
runs-on: depot-ubuntu-24.04

‎.github/workflows/ci-hog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
- name: Check if ANTLR definitions are up to date
9999
run: |
100100
cd ..
101-
sudo apt-get install default-jre
101+
sudo apt-get update && sudo apt-get install default-jre
102102
mkdir antlr
103103
cd antlr
104104
curl -o antlr.jar https://www.antlr.org/download/antlr-$ANTLR_VERSION-complete.jar

‎.oxlintrc.json‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -227,18 +227,6 @@
227227
"no-constant-binary-expression": "error",
228228
"no-useless-rename": "error",
229229
"no-useless-call": "error",
230-
"import/no-restricted-paths": [
231-
"error",
232-
{
233-
"zones": [
234-
{
235-
"target": "./frontend/**",
236-
"from": "./ee/frontend/**",
237-
"message": "EE licensed TypeScript should only be accessed via the posthogEE objects. Use `import posthogEE from '@posthog/ee/exports'`"
238-
}
239-
]
240-
}
241-
],
242230
"jest/no-restricted-matchers": [
243231
"error",
244232
{

‎Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ COPY common/hogvm/typescript/ common/hogvm/typescript/
3434
COPY common/esbuilder/ common/esbuilder/
3535
COPY common/tailwind/ common/tailwind/
3636
COPY products/ products/
37-
COPY ee/frontend/ ee/frontend/
3837
COPY .git/config .git/config
3938
COPY .git/HEAD .git/HEAD
4039
COPY .git/refs/heads .git/refs/heads

0 commit comments

Comments
 (0)