Skip to content

Commit adbd422

Browse files
Merge pull request #3351 from quadratichq/qa
QA Aug 8
2 parents d4cc7f2 + bae288a commit adbd422

Some content is hidden

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

54 files changed

+716
-512
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ jobs:
4848
node-version: 24
4949

5050
- name: Set up Rust
51-
uses: actions-rs/toolchain@v1
52-
with:
53-
toolchain: stable
54-
components: clippy, llvm-tools-preview
55-
override: true
51+
run: rustup toolchain install
5652

5753
- name: Install Protoc
5854
uses: arduino/setup-protoc@v3
@@ -120,11 +116,9 @@ jobs:
120116
node-version: 24
121117

122118
- name: Set up Rust
123-
uses: actions-rs/toolchain@v1
119+
uses: dtolnay/rust-toolchain@nightly
124120
with:
125-
toolchain: nightly
126-
components: clippy, llvm-tools-preview
127-
override: true
121+
components: clippy, rustfmt, llvm-tools-preview
128122

129123
- name: Install Protoc
130124
uses: arduino/setup-protoc@v3
@@ -173,11 +167,7 @@ jobs:
173167
cache: "pip"
174168

175169
- name: Set up Rust
176-
uses: actions-rs/toolchain@v1
177-
with:
178-
toolchain: stable
179-
target: wasm32-unknown-unknown
180-
override: true
170+
run: rustup toolchain install
181171

182172
- name: Install Protoc
183173
uses: arduino/setup-protoc@v3
@@ -258,11 +248,7 @@ jobs:
258248
node-version: 24
259249

260250
- name: Set up Rust
261-
uses: actions-rs/toolchain@v1
262-
with:
263-
toolchain: stable
264-
components: clippy
265-
override: true
251+
run: rustup toolchain install
266252

267253
- name: Install Protoc
268254
uses: arduino/setup-protoc@v3
@@ -292,12 +278,7 @@ jobs:
292278
node-version: 24
293279

294280
- name: Set up Rust
295-
uses: actions-rs/toolchain@v1
296-
with:
297-
toolchain: stable
298-
components: clippy
299-
target: wasm32-unknown-unknown
300-
override: true
281+
run: rustup toolchain install
301282

302283
- name: Install Protoc
303284
uses: arduino/setup-protoc@v3

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"dont",
5656
"dotenv",
5757
"dpkg",
58+
"dtolnay",
5859
"elif",
5960
"Embedder",
6061
"endregion",

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ edition = "2024"
1515
description = "Infinite data grid with Python, JavaScript, and SQL built-in"
1616
repository = "https://github.com/quadratichq/quadratic"
1717
license-file = "LICENSE"
18-
version = "0.16.1"
18+
version = "0.16.2"
1919

2020

2121
[profile.release]

Dockerfile.dev

Lines changed: 0 additions & 30 deletions
This file was deleted.

Procfile

Lines changed: 0 additions & 3 deletions
This file was deleted.

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.16.1
1+
0.16.2

app.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

docker-compose.yml

Lines changed: 0 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ services:
8585
VITE_QUADRATIC_API_URL: ${QUADRATIC_API_URL_EXTERNAL}
8686
VITE_QUADRATIC_MULTIPLAYER_URL: ${QUADRATIC_MULTIPLAYER_URL_EXTERNAL}
8787
VITE_QUADRATIC_CONNECTION_URL: ${QUADRATIC_CONNECTION_URL_EXTERNAL}
88-
VITE_STORAGE_TYPE: ${STORAGE_TYPE}
8988
VITE_AUTH_TYPE: ${AUTH_TYPE}
9089
VITE_AUTH0_ISSUER: ${AUTH0_ISSUER}
9190
VITE_AUTH0_DOMAIN: ${VITE_AUTH0_DOMAIN}
@@ -303,144 +302,6 @@ services:
303302
extra_hosts:
304303
- "host.docker.internal:host-gateway"
305304

306-
quadratic-dev:
307-
build:
308-
context: .
309-
dockerfile: Dockerfile.dev
310-
container_name: quadratic-dev
311-
environment:
312-
# common
313-
RUST_LOG: ${RUST_LOG}
314-
# client
315-
VITE_DEBUG: 1
316-
VITE_QUADRATIC_API_URL: ${QUADRATIC_API_URL_EXTERNAL}
317-
VITE_QUADRATIC_MULTIPLAYER_URL: ${QUADRATIC_MULTIPLAYER_URL_EXTERNAL}
318-
VITE_QUADRATIC_CONNECTION_URL: ${QUADRATIC_CONNECTION_URL_EXTERNAL}
319-
VITE_STORAGE_TYPE: ${STORAGE_TYPE}
320-
VITE_AUTH_TYPE: ${AUTH_TYPE}
321-
VITE_AUTH0_ISSUER: ${AUTH0_ISSUER}
322-
VITE_AUTH0_DOMAIN: ${VITE_AUTH0_DOMAIN}
323-
VITE_AUTH0_CLIENT_ID: ${VITE_AUTH0_CLIENT_ID}
324-
VITE_AUTH0_AUDIENCE: ${AUTH0_AUDIENCE}
325-
VITE_ORY_HOST: ${KRATOS_URL_EXTERNAL}
326-
VITE_SENTRY_AUTH_TOKEN: ${SENTRY_AUTH_TOKEN}
327-
# api
328-
CORS: "*"
329-
DATABASE_URL: ${DATABASE_DSN}
330-
STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY}
331-
STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET}
332-
BILLING_AI_USAGE_LIMIT: ${BILLING_AI_USAGE_LIMIT}
333-
GCP_REGION: ${GCP_REGION}
334-
GCP_REGION_ANTHROPIC: ${GCP_REGION_ANTHROPIC}
335-
GCP_PROJECT_ID: ${GCP_PROJECT_ID}
336-
GCP_CLIENT_EMAIL: ${GCP_CLIENT_EMAIL}
337-
GCP_PRIVATE_KEY: ${GCP_PRIVATE_KEY}
338-
ANTHROPIC_API_KEY: ${ANTHROPIC_API_KEY}
339-
OPENAI_API_KEY: ${OPENAI_API_KEY}
340-
AZURE_OPENAI_ENDPOINT: ${AZURE_OPENAI_ENDPOINT}
341-
AZURE_OPENAI_API_KEY: ${AZURE_OPENAI_API_KEY}
342-
XAI_API_KEY: ${XAI_API_KEY}
343-
BASETEN_API_KEY: ${BASETEN_API_KEY}
344-
FIREWORKS_API_KEY: ${FIREWORKS_API_KEY}
345-
OPEN_ROUTER_API_KEY: ${OPEN_ROUTER_API_KEY}
346-
AWS_S3_REGION: ${AWS_S3_REGION}
347-
AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME}
348-
AWS_S3_ANALYTICS_BUCKET_NAME: ${AWS_S3_ANALYTICS_BUCKET_NAME}
349-
AWS_S3_ACCESS_KEY_ID: ${AWS_S3_ACCESS_KEY_ID}
350-
AWS_S3_SECRET_ACCESS_KEY: ${AWS_S3_SECRET_ACCESS_KEY}
351-
M2M_AUTH_TOKEN: ${M2M_AUTH_TOKEN}
352-
ENCRYPTION_KEY: ${ENCRYPTION_KEY}
353-
AUTH_TYPE: ${AUTH_TYPE}
354-
AUTH0_JWKS_URI: ${JWKS_URI}
355-
AUTH0_ISSUER: ${AUTH0_ISSUER}
356-
AUTH0_DOMAIN: ${AUTH0_DOMAIN}
357-
AUTH0_CLIENT_ID: ${AUTH0_CLIENT_ID}
358-
AUTH0_CLIENT_SECRET: ${AUTH0_CLIENT_SECRET}
359-
AUTH0_AUDIENCE: ${AUTH0_AUDIENCE}
360-
ORY_JWKS_URI: ${JWKS_URI}
361-
ORY_ADMIN_HOST: ${ORY_ADMIN_HOST}
362-
STORAGE_TYPE: ${STORAGE_TYPE}
363-
QUADRATIC_FILE_URI: ${QUADRATIC_FILES_URL_INTERNAL}
364-
QUADRATIC_FILE_URI_PUBLIC: ${QUADRATIC_FILES_URL_EXTERNAL}
365-
LICENSE_KEY: ${LICENSE_KEY}
366-
# multiplayer
367-
MULTIPLAYER__HOST: ${QUADRATIC_MULTIPLAYER_HOST}
368-
MULTIPLAYER__PORT: ${QUADRATIC_MULTIPLAYER_PORT}
369-
MULTIPLAYER__HEARTBEAT_CHECK_S: ${QUADRATIC_MULTIPLAYER_HEARTBEAT_CHECK_S}
370-
MULTIPLAYER__HEARTBEAT_TIMEOUT_S: ${QUADRATIC_MULTIPLAYER_HEARTBEAT_TIMEOUT_S}
371-
MULTIPLAYER__QUADRATIC_API_URI: ${QUADRATIC_API_URL_INTERNAL}
372-
MULTIPLAYER__M2M_AUTH_TOKEN: ${M2M_AUTH_TOKEN}
373-
MULTIPLAYER__ENVIRONMENT: ${ENVIRONMENT}
374-
MULTIPLAYER__PUBSUB_HOST: ${PUBSUB_HOST}
375-
MULTIPLAYER__PUBSUB_PORT: ${PUBSUB_PORT}
376-
MULTIPLAYER__PUBSUB_PASSWORD: ${PUBSUB_PASSWORD}
377-
MULTIPLAYER__PUBSUB_ACTIVE_CHANNELS: ${PUBSUB_ACTIVE_CHANNELS}
378-
MULTIPLAYER__AUTH0_JWKS_URI: ${JWKS_URI}
379-
MULTIPLAYER__AUTHENTICATE_JWT: true
380-
# files
381-
FILES__HOST: ${QUADRATIC_FILES_HOST}
382-
FILES__PORT: ${QUADRATIC_FILES_PORT}
383-
FILES__FILE_CHECK_S: ${QUADRATIC_FILES_FILE_CHECK_S}
384-
FILES__FILES_PER_CHECK: ${QUADRATIC_FILES_FILES_PER_CHECK}
385-
FILES__TRUNCATE_FILE_CHECK_S: ${QUADRATIC_FILES_TRUNCATE_FILE_CHECK_S}
386-
FILES__TRUNCATE_TRANSACTION_AGE_DAYS: ${QUADRATIC_FILES_TRUNCATE_TRANSACTION_AGE_DAYS}
387-
FILES__ENVIRONMENT: ${ENVIRONMENT}
388-
FILES__AUTH0_JWKS_URI: ${JWKS_URI}
389-
FILES__QUADRATIC_API_URI: ${QUADRATIC_API_URL_INTERNAL}
390-
FILES__M2M_AUTH_TOKEN: ${M2M_AUTH_TOKEN}
391-
FILES__PUBSUB_HOST: ${PUBSUB_HOST}
392-
FILES__PUBSUB_PORT: ${PUBSUB_PORT}
393-
FILES__PUBSUB_PASSWORD: ${PUBSUB_PASSWORD}
394-
FILES__PUBSUB_ACTIVE_CHANNELS: ${PUBSUB_ACTIVE_CHANNELS}
395-
FILES__PUBSUB_PROCESSED_TRANSACTIONS_CHANNEL: ${PUBSUB_PROCESSED_TRANSACTIONS_CHANNEL}
396-
FILES__STORAGE_TYPE: ${STORAGE_TYPE}
397-
FILES__AWS_S3_REGION: ${AWS_S3_REGION}
398-
FILES__AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME}
399-
FILES__AWS_S3_ACCESS_KEY_ID: ${AWS_S3_ACCESS_KEY_ID}
400-
FILES__AWS_S3_SECRET_ACCESS_KEY: ${AWS_S3_SECRET_ACCESS_KEY}
401-
FILES__STORAGE_DIR: ${STORAGE_DIR}
402-
FILES__STORAGE_ENCRYPTION_KEYS: ${ENCRYPTION_KEY}
403-
# connection
404-
CONNECTION__HOST: ${QUADRATIC_CONNECTION_HOST}
405-
CONNECTION__PORT: ${QUADRATIC_CONNECTION_PORT}
406-
CONNECTION__ENVIRONMENT: ${ENVIRONMENT}
407-
CONNECTION__AUTH0_JWKS_URI: ${JWKS_URI}
408-
CONNECTION__QUADRATIC_API_URI: ${QUADRATIC_API_URL_INTERNAL}
409-
CONNECTION__M2M_AUTH_TOKEN: ${M2M_AUTH_TOKEN}
410-
CONNECTION__MAX_RESPONSE_BYTES: ${QUADRATIC_CONNECTION_MAX_RESPONSE_BYTES}
411-
CONNECTION__STATIC_IPS: ${QUADRATIC_CONNECTION_STATIC_IPS}
412-
ports:
413-
- "3000:3000"
414-
- "8000:8000"
415-
- "3001:3001"
416-
- "3002:3002"
417-
- "3003:3003"
418-
volumes:
419-
- ./:/quadratic:rw
420-
- ./docker/file-storage:/file-storage:rw
421-
depends_on:
422-
redis:
423-
condition: service_healthy
424-
postgres:
425-
condition: service_healthy
426-
ory-auth:
427-
condition: service_started
428-
ory-auth-migrate:
429-
condition: service_started
430-
ory-auth-node:
431-
condition: service_started
432-
ory-auth-mail:
433-
condition: service_started
434-
profiles:
435-
- quadratic-dev
436-
- dev
437-
networks:
438-
- host
439-
extra_hosts:
440-
- "host.docker.internal:host-gateway"
441-
tty: true
442-
stdin_open: true
443-
444305
# auth service - ory
445306

446307
ory-auth:

infra/client/build-client-ci.sh

Lines changed: 0 additions & 28 deletions
This file was deleted.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "quadratic",
3-
"version": "0.16.1",
3+
"version": "0.16.2",
44
"author": {
55
"name": "David Kircos",
66
"email": "david@quadratichq.com",
@@ -67,7 +67,6 @@
6767
"gen:pyright:worker": "npm run gen:pyright:worker --workspace=quadratic-kernels/python-wasm",
6868
"docker:base": "ECR_OR_BUILD=build CLIENT_DEV=false docker compose --profile base --env-file .env.docker up",
6969
"docker:connection": "ECR_OR_BUILD=build docker compose --profile base --profile quadratic-connection-db --env-file .env.docker up",
70-
"docker:dev": "ECR_OR_BUILD=build CLIENT_DEV=true docker compose --profile dev --env-file .env.docker up -d && docker attach quadratic-dev",
7170
"docker:build": "ECR_OR_BUILD=build CLIENT_DEV=false docker compose --profile all --env-file .env.docker up",
7271
"docker:build:dev": "ECR_OR_BUILD=build CLIENT_DEV=true docker compose --profile all --env-file .env.docker up",
7372
"docker:ecr": "ECR_OR_BUILD=ecr CLIENT_DEV=false docker compose --profile all --env-file .env.docker up",

0 commit comments

Comments
 (0)