Skip to content

Commit

Permalink
Merge branch 'master' into tom/fix-react-error
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gilbert09
Gilbert09 authored Jun 12, 2024
2 parents 963c0fd + 57647c8 commit 1163789
Show file tree
Hide file tree
Showing 21 changed files with 430 additions and 293 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/rust-docker-build.yml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name: Build container images
name: Build rust container images

on:
workflow_dispatch:
push:
paths:
- 'rust/**'
- '.github/workflows/rust-docker-build.yml'
branches:
- 'master'

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/rust-hook-migrator-docker.yml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name: Build hook-migrator docker image
name: Build rust hook-migrator docker image

on:
workflow_dispatch:
push:
paths:
- 'rust/**'
- '.github/workflows/rust-hook-migrator-docker.yml'
branches:
- 'master'

Expand Down Expand Up @@ -57,7 +58,7 @@ jobs:
id: meta
uses: docker/metadata-action@v4
with:
images: ghcr.io/posthog/hog-rs/hook-migrator
images: ghcr.io/posthog/posthog/hook-migrator
tags: |
type=ref,event=pr
type=ref,event=branch
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/rust.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Rust
name: Rust test CI

on:
workflow_dispatch:
Expand Down Expand Up @@ -31,8 +31,12 @@ jobs:
rust:
# Avoid running rust tests for irrelevant changes
- 'rust/**'
- '.github/workflows/rust.yml'
- '.github/workflows/rust-docker-build.yml'
- '.github/workflows/rust-hook-migrator-docker.yml'
build:
name: Build rust services
needs: changes
runs-on: depot-ubuntu-22.04-4

Expand Down Expand Up @@ -68,6 +72,7 @@ jobs:
run: cargo build --all --locked --release && find target/release/ -maxdepth 1 -executable -type f | xargs strip

test:
name: Test rust services
needs: changes
runs-on: depot-ubuntu-22.04-4
timeout-minutes: 10
Expand Down Expand Up @@ -118,6 +123,7 @@ jobs:
run: cargo test --all-features

linting:
name: Lint rust services
needs: changes
runs-on: depot-ubuntu-22.04-4

Expand Down Expand Up @@ -163,6 +169,7 @@ jobs:
run: cargo check --all-features

shear:
name: Shear rust services
needs: changes
runs-on: depot-ubuntu-22.04-4

Expand Down
63 changes: 63 additions & 0 deletions frontend/src/queries/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,7 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"limit": {
Expand All @@ -555,6 +556,7 @@
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"offset": {
Expand Down Expand Up @@ -628,6 +630,7 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"limit": {
Expand All @@ -638,6 +641,7 @@
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"offset": {
Expand Down Expand Up @@ -709,6 +713,7 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"limit": {
Expand All @@ -719,6 +724,7 @@
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"offset": {
Expand Down Expand Up @@ -774,13 +780,15 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"query_status": {
Expand Down Expand Up @@ -861,6 +869,7 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"limit": {
Expand All @@ -875,6 +884,7 @@
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"offset": {
Expand Down Expand Up @@ -1010,9 +1020,11 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"query_status": {
Expand Down Expand Up @@ -1076,13 +1088,15 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"query_status": {
Expand Down Expand Up @@ -1134,13 +1148,15 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"query_status": {
Expand Down Expand Up @@ -1192,13 +1208,15 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"query_status": {
Expand Down Expand Up @@ -1253,13 +1271,15 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"query_status": {
Expand Down Expand Up @@ -1311,13 +1331,15 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"query_status": {
Expand Down Expand Up @@ -1369,13 +1391,15 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"query_status": {
Expand Down Expand Up @@ -1433,13 +1457,15 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"query_status": {
Expand Down Expand Up @@ -1501,6 +1527,7 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"limit": {
Expand All @@ -1511,6 +1538,7 @@
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"offset": {
Expand Down Expand Up @@ -1574,13 +1602,15 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"query_status": {
Expand Down Expand Up @@ -3927,6 +3957,33 @@
"required": ["results"],
"type": "object"
},
"GenericCachedQueryResponse": {
"properties": {
"cache_key": {
"type": "string"
},
"is_cached": {
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"query_status": {
"$ref": "#/definitions/QueryStatus",
"description": "Query status indicates whether next to the provided data, a query is still running."
},
"timezone": {
"type": "string"
}
},
"required": ["cache_key", "is_cached", "last_refresh", "next_allowed_client_refresh", "timezone"],
"type": "object"
},
"GoalLine": {
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -7027,6 +7084,10 @@
{
"const": "force_cache",
"type": "string"
},
{
"const": "lazy_async",
"type": "string"
}
]
},
Expand Down Expand Up @@ -7668,13 +7729,15 @@
"type": "boolean"
},
"last_refresh": {
"format": "date-time",
"type": "string"
},
"modifiers": {
"$ref": "#/definitions/HogQLQueryModifiers",
"description": "Modifiers used when performing the query"
},
"next_allowed_client_refresh": {
"format": "date-time",
"type": "string"
},
"query_status": {
Expand Down
Loading

0 comments on commit 1163789

Please sign in to comment.