Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dependabot/maven/sp…
Browse files Browse the repository at this point in the history
…ring-49998e4561
  • Loading branch information
jesperancinha committed Jan 19, 2025
2 parents 18721a0 + 38fc10f commit 295c0d7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions e2e/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.7'
services:
e2e-electron:
image: "cypress/included:13.17.0"
image: "cypress/included:14.0.0"
working_dir: /e2e
command: "--browser electron --config defaultCommandTimeout=15000,requestTimeout=15000"
volumes:
Expand All @@ -10,7 +10,7 @@ services:
- bl-net

e2e-chrome:
image: "cypress/included:13.17.0"
image: "cypress/included:14.0.0"
working_dir: /e2e
command: "--browser chrome --config defaultCommandTimeout=15000,requestTimeout=15000"
volumes:
Expand All @@ -19,7 +19,7 @@ services:
- bl-net

e2e-firefox:
image: "cypress/included:13.17.0"
image: "cypress/included:14.0.0"
working_dir: /e2e
command: "--browser firefox --config defaultCommandTimeout=15000,requestTimeout=15000"
volumes:
Expand All @@ -28,7 +28,7 @@ services:
- bl-net

e2e-firefox-full:
image: "cypress/included:13.17.0"
image: "cypress/included:14.0.0"
working_dir: /e2e
command: "--config-file /e2e/full.cypress.config.ts --browser firefox --config defaultCommandTimeout=15000,requestTimeout=15000"
volumes:
Expand All @@ -37,7 +37,7 @@ services:
- bl-net

e2e-edge:
image: "cypress/included:13.17.0"
image: "cypress/included:14.0.0"
working_dir: /e2e
command: "--browser edge --config defaultCommandTimeout=15000,requestTimeout=15000"
volumes:
Expand Down
2 changes: 1 addition & 1 deletion pr.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
PR Accept on Sun Jan 12 09:25:08 CET 2025
PR Accept on Sun Jan 19 09:19:43 CET 2025

0 comments on commit 295c0d7

Please sign in to comment.