Skip to content

Commit 944baf9

Browse files
authored
Merge branch 'main' into chris/fix-query-client-rn
2 parents 55b9454 + f5df7c7 commit 944baf9

40 files changed

Lines changed: 2167 additions & 4 deletions

.changeset/cyan-taxis-float.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.changeset/gold-heads-float.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.changeset/light-queens-study.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.changeset/warm-foxes-glow.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.changeset/yummy-hoops-drum.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ jobs:
306306
"react-router",
307307
"custom",
308308
"hono",
309+
"chrome-extension",
309310
]
310311
test-project: ["chrome"]
311312
include:

.github/workflows/e2e-staging.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,23 @@ concurrency:
3737
cancel-in-progress: true
3838

3939
jobs:
40+
validate-instances:
41+
name: Validate Staging Instances
42+
runs-on: 'blacksmith-8vcpu-ubuntu-2204'
43+
steps:
44+
- name: Checkout Repo
45+
uses: actions/checkout@v4
46+
with:
47+
ref: ${{ github.event.inputs.ref || github.event.client_payload.ref || 'main' }}
48+
sparse-checkout: scripts/validate-staging-instances.mjs
49+
fetch-depth: 1
50+
51+
- name: Validate staging instance settings
52+
run: node scripts/validate-staging-instances.mjs
53+
env:
54+
INTEGRATION_INSTANCE_KEYS: ${{ secrets.INTEGRATION_INSTANCE_KEYS }}
55+
INTEGRATION_STAGING_INSTANCE_KEYS: ${{ secrets.INTEGRATION_STAGING_INSTANCE_KEYS }}
56+
4057
integration-tests:
4158
name: Integration Tests (${{ matrix.test-name }}, ${{ matrix.test-project }})
4259
runs-on: 'blacksmith-8vcpu-ubuntu-2204'
@@ -265,7 +282,7 @@ jobs:
265282
]
266283
}
267284
env:
268-
SLACK_WEBHOOK_URL: ${{ secrets.SDK_SLACKER_WEBHOOK_URL }}
285+
SLACK_WEBHOOK_URL: ${{ secrets.STAGING_E2E_SLACK_WEBHOOK_URL }}
269286
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
270287

271288
# Uncomment when clerk_go side is ready

integration/.keys.json.sample

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,9 @@
6262
"with-protect-service": {
6363
"pk": "",
6464
"sk": ""
65+
},
66+
"with-enterprise-sso": {
67+
"pk": "",
68+
"sk": ""
6569
}
6670
}

0 commit comments

Comments
 (0)