Skip to content

Commit 770a502

Browse files
authored
fix: revert HiDPI for Wayland users to resolve unknown issues with GLib-GIO-ERROR and cy.screenshot() timeouts [run ci] (#30179)
1 parent c1b95b5 commit 770a502

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

.circleci/workflows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ mainBuildFilters: &mainBuildFilters
3030
- /^release\/\d+\.\d+\.\d+$/
3131
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
3232
- 'update-v8-snapshot-cache-on-develop'
33+
- 'fix/revert_ozone_hint'
3334
- 'publish-binary'
3435
- 'chore/support_hidpi_wayland'
3536
- 'ryanm/chore/fix-kitchensink-against-staging'
@@ -43,7 +44,6 @@ macWorkflowFilters: &darwin-workflow-filters
4344
- equal: [ develop, << pipeline.git.branch >> ]
4445
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
4546
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
46-
- equal: [ 'chore/support_hidpi_wayland', << pipeline.git.branch >> ]
4747
- matches:
4848
pattern: /^release\/\d+\.\d+\.\d+$/
4949
value: << pipeline.git.branch >>
@@ -54,7 +54,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
5454
- equal: [ develop, << pipeline.git.branch >> ]
5555
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
5656
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
57-
- equal: [ 'chore/support_hidpi_wayland', << pipeline.git.branch >> ]
57+
- equal: [ 'fix/revert_ozone_hint', << pipeline.git.branch >> ]
5858
- matches:
5959
pattern: /^release\/\d+\.\d+\.\d+$/
6060
value: << pipeline.git.branch >>
@@ -153,7 +153,7 @@ commands:
153153
name: Set environment variable to determine whether or not to persist artifacts
154154
command: |
155155
echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
156-
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "chore/support_hidpi_wayland" ]]; then
156+
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "fix/revert_ozone_hint" ]]; then
157157
export SHOULD_PERSIST_ARTIFACTS=true
158158
fi' >> "$BASH_ENV"
159159
# You must run `setup_should_persist_artifacts` command and be using bash before running this command

cli/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ _Released 9/10/2024 (PENDING)_
66
**Bugfixes:**
77

88
- Fixed an issue where Cypress could crash with a `WebSocket Connection Closed` error. Fixes [#30100](https://github.com/cypress-io/cypress/issues/30100).
9+
- Fixed an issue where `cy.screenshot()` was timing out and Cypress was failing to start due to `GLib-GIO-ERROR` error. Reverts [#30109](https://github.com/cypress-io/cypress/pull/30109), the change to allow HiDPI screen for Wayland users. Fixes [#30172](https://github.com/cypress-io/cypress/issues/30172) and [#30160](https://github.com/cypress-io/cypress/issues/30160).
910

1011
## 13.14.1
1112

cli/lib/exec/spawn.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ module.exports = {
155155

156156
const { onStderrData } = overrides
157157
const envOverrides = util.getEnvOverrides(options)
158-
const electronArgs = ['--ozone-platform-hint=auto']
158+
const electronArgs = []
159159
const node11WindowsFix = isPlatform('win32')
160160

161161
let startScriptPath

cli/test/lib/exec/spawn_spec.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ describe('lib/exec/spawn', function () {
121121
return spawn.start('--foo', { foo: 'bar' })
122122
.then(() => {
123123
expect(cp.spawn).to.be.calledWithMatch('/path/to/cypress', [
124-
'--ozone-platform-hint=auto',
125124
'--',
126125
'--foo',
127126
'--cwd',
@@ -149,7 +148,6 @@ describe('lib/exec/spawn', function () {
149148
const args = cp.spawn.firstCall.args.slice(0, 2)
150149
// it is important for "--no-sandbox" to appear before "--" separator
151150
const expectedCliArgs = [
152-
'--ozone-platform-hint=auto',
153151
'--no-sandbox',
154152
'--',
155153
'--foo',
@@ -175,7 +173,6 @@ describe('lib/exec/spawn', function () {
175173
.then(() => {
176174
expect(cp.spawn).to.be.calledWithMatch('node', [
177175
p,
178-
'--ozone-platform-hint=auto',
179176
'--',
180177
'--foo',
181178
'--cwd',
@@ -201,7 +198,6 @@ describe('lib/exec/spawn', function () {
201198
.then(() => {
202199
expect(cp.spawn).to.be.calledWithMatch('node', [
203200
p,
204-
'--ozone-platform-hint=auto',
205201
'--',
206202
'--foo',
207203
'--cwd',

0 commit comments

Comments
 (0)