Skip to content

Commit

Permalink
chore(ci): add merge group
Browse files Browse the repository at this point in the history
  • Loading branch information
spaenleh committed Feb 26, 2024
1 parent 0391525 commit 1e0f793
Show file tree
Hide file tree
Showing 3 changed files with 163 additions and 126 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/cypress-tests.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
name: Cypress tests
on: [push]
on:
push:
branches:
- "main"
merge_group:
pull_request:

jobs:
test:
concurrency: cypress-${{ github.head_ref || github.ref }}
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@graasp/sdk": "github:graasp/graasp-sdk#esm-package",
"@graasp/translations": "^1.23.0",
"@graasp/translations": "^1.25.1",
"@graasp/ui": "^4.8.1",
"@mui/icons-material": "^5.15.10",
"@mui/material": "^5.15.10",
"cypress": "^13.6.4",
"cypress": "^13.6.6",
"date-fns": "^3.3.1",
"lodash.groupby": "^4.6.0",
"prism-react-renderer": "^2.3.1",
Expand All @@ -54,7 +54,7 @@
"react-markdown": "^9.0.1",
"react-mentions": "^4.4.10",
"react-query": "^3.39.3",
"react-router-dom": "^6.22.0",
"react-router-dom": "^6.22.1",
"remark-breaks": "^4.0.0",
"remark-gfm": "^4.0.0"
},
Expand All @@ -63,25 +63,25 @@
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/lodash.groupby": "^4.6.9",
"@types/lodash.truncate": "^4.4.9",
"@types/node": "^20.11.19",
"@types/react": "^18.2.55",
"@types/node": "^20.11.20",
"@types/react": "^18.2.58",
"@types/react-dom": "^18.2.19",
"@types/react-mentions": "^4.1.13",
"@typescript-eslint/eslint-plugin": "^7.0.1",
"@typescript-eslint/parser": "^7.0.1",
"@typescript-eslint/eslint-plugin": "^7.0.2",
"@typescript-eslint/parser": "^7.0.2",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.5",
"i18next": "23.8.2",
"i18next": "23.10.0",
"prettier": "^3.2.5",
"rollup-plugin-visualizer": "^5.12.0",
"stylis-plugin-rtl": "^2.1.1",
"tsc-alias": "^1.8.8",
"typescript": "^5.3.3",
"vite": "^5.1.3",
"vite-plugin-dts": "^3.7.2"
"vite": "^5.1.4",
"vite-plugin-dts": "^3.7.3"
},
"peerDependencies": {
"@emotion/react": "^11.11.1",
Expand Down
Loading

0 comments on commit 1e0f793

Please sign in to comment.