Skip to content

Commit 8188740

Browse files
committed
Merge remote-tracking branch 'origin/dev' into built-with-oa
2 parents 4415144 + 45e8edd commit 8188740

284 files changed

Lines changed: 29730 additions & 4514 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Please review the PR comments with `gh pr status` and fix & resolve those issues that are valid and relevant. Leave those comments that are mostly bullshit unresolved. Report the result to me in detail. Do NOT automatically commit or stage the changes back to the PR!

.github/workflows/db-migration-backwards-compatibility.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ jobs:
150150
- name: Wait on Svix
151151
run: pnpx wait-on tcp:localhost:8113
152152

153+
- name: Wait on ClickHouse
154+
run: pnpx wait-on http://localhost:8136/ping
155+
153156
- name: Initialize database
154157
run: pnpm run db:init
155158

.github/workflows/e2e-api-tests.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
NODE_ENV: test
2020
STACK_ENABLE_HARDCODED_PASSKEY_CHALLENGE_FOR_TESTING: yes
2121
STACK_DATABASE_CONNECTION_STRING: "postgres://postgres:PASSWORD-PLACEHOLDER--uqfEC1hmmv@localhost:8128/stackframe"
22-
STACK_FORCE_EXTERNAL_DB_SYNC: "true"
2322
STACK_EXTERNAL_DB_SYNC_MAX_DURATION_MS: "20000"
2423
STACK_EXTERNAL_DB_SYNC_DIRECT: "false"
2524

@@ -107,6 +106,9 @@ jobs:
107106
- name: Wait on QStash
108107
run: pnpx wait-on tcp:localhost:8125
109108

109+
- name: Wait on ClickHouse
110+
run: pnpx wait-on http://localhost:8136/ping
111+
110112
- name: Initialize database
111113
run: pnpm run db:init
112114

@@ -160,7 +162,7 @@ jobs:
160162
run: sleep 10
161163

162164
- name: Run tests
163-
run: pnpm test run ${{ matrix.freestyle-mode == 'prod' && '--min-workers=1 --max-workers=1' || '' }}
165+
run: pnpm test run ${{ matrix.freestyle-mode == 'prod' && '--min-workers=1 --max-workers=1' || '' }} ${{ matrix.freestyle-mode == 'prod' && github.ref != 'refs/heads/main' && github.ref != 'refs/heads/dev' && 'mail' || '' }}
164166

165167
- name: Run tests again (attempt 1)
166168
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev'

.github/workflows/e2e-custom-base-port-api-tests.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
STACK_ENABLE_HARDCODED_PASSKEY_CHALLENGE_FOR_TESTING: yes
2020
STACK_DATABASE_CONNECTION_STRING: "postgres://postgres:PASSWORD-PLACEHOLDER--uqfEC1hmmv@localhost:6728/stackframe"
2121
NEXT_PUBLIC_STACK_PORT_PREFIX: "67"
22-
STACK_FORCE_EXTERNAL_DB_SYNC: "true"
2322
STACK_EXTERNAL_DB_SYNC_MAX_DURATION_MS: "20000"
2423
STACK_EXTERNAL_DB_SYNC_DIRECT: "false"
2524

@@ -101,6 +100,9 @@ jobs:
101100
- name: Wait on QStash
102101
run: pnpx wait-on tcp:localhost:6725
103102

103+
- name: Wait on ClickHouse
104+
run: pnpx wait-on http://localhost:6736/ping
105+
104106
- name: Initialize database
105107
run: pnpm run db:init
106108

.github/workflows/e2e-source-of-truth-api-tests.yaml

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

.github/workflows/restart-dev-and-test-with-custom-base-port.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
runs-on: ubicloud-standard-16
2020
env:
2121
NEXT_PUBLIC_STACK_PORT_PREFIX: "69"
22-
STACK_FORCE_EXTERNAL_DB_SYNC: "true"
2322
STACK_EXTERNAL_DB_SYNC_MAX_DURATION_MS: "20000"
2423
STACK_EXTERNAL_DB_SYNC_DIRECT: "false"
2524

.github/workflows/restart-dev-and-test.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
restart-dev-and-test:
1919
runs-on: ubicloud-standard-16
2020
env:
21-
STACK_FORCE_EXTERNAL_DB_SYNC: "true"
2221
STACK_EXTERNAL_DB_SYNC_MAX_DURATION_MS: "20000"
2322
STACK_EXTERNAL_DB_SYNC_DIRECT: "false"
2423

.github/workflows/setup-tests-with-custom-base-port.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
runs-on: ubicloud-standard-16
2020
env:
2121
NEXT_PUBLIC_STACK_PORT_PREFIX: "69"
22-
STACK_FORCE_EXTERNAL_DB_SYNC: "true"
2322
STACK_EXTERNAL_DB_SYNC_MAX_DURATION_MS: "20000"
2423
STACK_EXTERNAL_DB_SYNC_DIRECT: "false"
2524

.github/workflows/setup-tests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
setup-tests:
1919
runs-on: ubicloud-standard-16
2020
env:
21-
STACK_FORCE_EXTERNAL_DB_SYNC: "true"
2221
STACK_EXTERNAL_DB_SYNC_MAX_DURATION_MS: "20000"
2322
STACK_EXTERNAL_DB_SYNC_DIRECT: "false"
2423
steps:

.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"typescript.tsdk": "node_modules/typescript/lib",
88
"editor.tabSize": 2,
99
"cSpell.words": [
10+
"glassmorphic",
1011
"sparkline",
1112
"Clickhouse",
1213
"pushable",
@@ -174,5 +175,6 @@
174175
"((?:<!-- *)?(?:#|// @|//|./\\*+|<!--|--|\\* @|{!|{{!--|{{!) *(?:IDEA)(?:\\s*\\([^)]+\\))?:?)((?!\\w)(?: *-->| *\\*/| *!}| *--}}| *}}|(?= *(?:[^:]//|/\\*+|<!--|@|--|{!|{{!--|{{!))|(?: +[^\\n@]*?)(?= *(?:[^:]//|/\\*+|<!--|@|--(?!>)|{!|{{!--|{{!))|(?: +[^@\\n]+)?))": [],
175176
},
176177
"editor.formatOnSaveMode": "file",
177-
"git.ignoreLimitWarning": true
178+
"git.ignoreLimitWarning": true,
179+
"chatgpt.commentCodeLensEnabled": false
178180
}

0 commit comments

Comments
 (0)