Skip to content

Commit

Permalink
Merge branch 'develop' into tgriesser/chore/remove-ramda
Browse files Browse the repository at this point in the history
  • Loading branch information
tgriesser authored Nov 1, 2021
2 parents bbdbfd1 + 4cb97b3 commit 28500ed
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion browser-versions.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"chrome:beta": "96.0.4664.27",
"chrome:stable": "95.0.4638.54"
"chrome:stable": "95.0.4638.69"
}
10 changes: 5 additions & 5 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,7 @@ jobs:
fi
- wait-on-circle-jobs:
job-names: >
desktop-gui-integration-tests-2x,
desktop-gui-integration-tests-7x,
desktop-gui-component-tests,
cli-visual-tests,
runner-integration-tests-chrome,
Expand Down Expand Up @@ -1189,9 +1189,9 @@ jobs:
- run-driver-integration-tests:
browser: electron

desktop-gui-integration-tests-2x:
desktop-gui-integration-tests-7x:
<<: *defaults
parallelism: 2
parallelism: 7
steps:
- restore_cached_workspace
- run:
Expand Down Expand Up @@ -2049,7 +2049,7 @@ linux-workflow: &linux-workflow
requires:
- build

- desktop-gui-integration-tests-2x:
- desktop-gui-integration-tests-7x:
requires:
- build
- desktop-gui-component-tests:
Expand Down Expand Up @@ -2119,7 +2119,7 @@ linux-workflow: &linux-workflow
- reporter-integration-tests
- Linux lint
- desktop-gui-component-tests
- desktop-gui-integration-tests-2x
- desktop-gui-integration-tests-7x
- runner-ct-integration-tests-chrome
- runner-integration-tests-firefox
- runner-integration-tests-chrome
Expand Down

0 comments on commit 28500ed

Please sign in to comment.