Skip to content

Commit 1d34b87

Browse files
committed
Merge branch 'main' into playerCount-fix-2
2 parents e399b53 + 9da03b0 commit 1d34b87

39 files changed

Lines changed: 1619 additions & 30 deletions

.github/workflows/cypress.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ jobs:
77
run-cypress-tests:
88
timeout-minutes: 20
99
runs-on: ubuntu-latest
10-
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
container: [1, 2]
1114
steps:
1215
- name: Checkout
1316
uses: actions/checkout@v1
@@ -25,6 +28,9 @@ jobs:
2528
start: npm run start
2629
browser: chrome
2730
record: true
31+
parallel: true
32+
group: "CI RUN"
33+
ci-build-id: ${{ github.run_id }}
2834
wait-on: "http://localhost:3000, http://localhost:9001"
2935
wait-on-timeout: 600
3036
spec: e2e/*.{js,jsx,ts,tsx}

client/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"@daily-co/daily-js": "^0.73.0",
3+
"@daily-co/daily-js": "^0.80.0",
44
"@daily-co/daily-react": "^0.21.3",
55
"@empirica/core": "1.11.2",
66
"@hello-pangea/dnd": "^16.3.0",
417 KB
Loading
498 KB
Loading
413 KB
Loading
336 KB
Loading
352 KB
Loading
349 KB
Loading
326 KB
Loading

0 commit comments

Comments
 (0)