Skip to content

Commit 4322c76

Browse files
mabela416mabela416
committed
fix merge conflicts with changelog
2 parents 1591851 + cde3b2b commit 4322c76

File tree

12 files changed

+356
-299
lines changed

12 files changed

+356
-299
lines changed

‎.circleci/src/workflows/@workflows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ commands:
116116
name: Set environment variable to determine whether or not to persist artifacts
117117
command: |
118118
echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
119-
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "chore/refactor_cli_to_ts" ]]; then
119+
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "fix/dbus-messages" ]]; then
120120
export SHOULD_PERSIST_ARTIFACTS=true
121121
fi' >> "$BASH_ENV"
122122
# You must run `setup_should_persist_artifacts` command and be using bash before running this command

‎.circleci/src/workflows/workflows/@main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

2-
32
linux-x64:
43
when: &full-workflow-filters
54
or:
65
- equal: [ develop, << pipeline.git.branch >> ]
76
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
87
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
8+
- equal: [ 'fix/dbus-messages', << pipeline.git.branch >> ]
99
- matches:
1010
pattern: /^release\/\d+\.\d+\.\d+$/
1111
value: << pipeline.git.branch >>

‎.circleci/workflows.yml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ commands:
868868
- run:
869869
command: |
870870
echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
871-
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "chore/refactor_cli_to_ts" ]]; then
871+
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "fix/dbus-messages" ]]; then
872872
export SHOULD_PERSIST_ARTIFACTS=true
873873
fi' >> "$BASH_ENV"
874874
name: Set environment variable to determine whether or not to persist artifacts
@@ -3717,6 +3717,9 @@ workflows:
37173717
- equal:
37183718
- update-v8-snapshot-cache-on-develop
37193719
- << pipeline.git.branch >>
3720+
- equal:
3721+
- fix/dbus-messages
3722+
- << pipeline.git.branch >>
37203723
- matches:
37213724
pattern: /^release\/\d+\.\d+\.\d+$/
37223725
value: << pipeline.git.branch >>
@@ -3771,6 +3774,9 @@ workflows:
37713774
- equal:
37723775
- update-v8-snapshot-cache-on-develop
37733776
- << pipeline.git.branch >>
3777+
- equal:
3778+
- fix/dbus-messages
3779+
- << pipeline.git.branch >>
37743780
- matches:
37753781
pattern: /^release\/\d+\.\d+\.\d+$/
37763782
value: << pipeline.git.branch >>
@@ -3836,6 +3842,9 @@ workflows:
38363842
- equal:
38373843
- update-v8-snapshot-cache-on-develop
38383844
- << pipeline.git.branch >>
3845+
- equal:
3846+
- fix/dbus-messages
3847+
- << pipeline.git.branch >>
38393848
- matches:
38403849
pattern: /^release\/\d+\.\d+\.\d+$/
38413850
value: << pipeline.git.branch >>
@@ -4321,6 +4330,9 @@ workflows:
43214330
- equal:
43224331
- update-v8-snapshot-cache-on-develop
43234332
- << pipeline.git.branch >>
4333+
- equal:
4334+
- fix/dbus-messages
4335+
- << pipeline.git.branch >>
43244336
- matches:
43254337
pattern: /^release\/\d+\.\d+\.\d+$/
43264338
value: << pipeline.git.branch >>
@@ -5156,6 +5168,9 @@ workflows:
51565168
- equal:
51575169
- update-v8-snapshot-cache-on-develop
51585170
- << pipeline.git.branch >>
5171+
- equal:
5172+
- fix/dbus-messages
5173+
- << pipeline.git.branch >>
51595174
- matches:
51605175
pattern: /^release\/\d+\.\d+\.\d+$/
51615176
value: << pipeline.git.branch >>

‎cli/CHANGELOG.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
<!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
22
## 15.4.0
33

4-
_Released 9/30/2025 (PENDING)_
4+
_Released (PENDING)_
55

66
**Features:**
77

88
- Remove `experimentalStudio` config flag and turn Studio Beta on for all users of Cypress. Addresses [#30997](https://github.com/cypress-io/cypress/issues/30997). Addressed in [#32571](https://github.com/cypress-io/cypress/pull/32571).
99

10+
## 15.3.1
11+
12+
_Released 10/07/2025 (PENDING)_
13+
14+
**Bugfixes:**
15+
16+
- Fixed a regression introduced in [`15.0.0`](https://docs.cypress.io/guides/references/changelog#15-0-0) where `dbus` connection error messages appear in docker containers when launching Cypress. Fixes [#32290](https://github.com/cypress-io/cypress/issues/32290).
17+
1018
## 15.3.0
1119

1220
_Released 9/23/2025_

‎cli/lib/exec/info.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable no-console */
2-
import spawn from './spawn'
2+
import { start as spawnStart } from './spawn'
33
import util from '../util'
44
import state from '../tasks/state'
55
import os from 'os'
@@ -47,7 +47,7 @@ const formatCypressVariables = (): any => {
4747
methods.start = async (options: any = {}): Promise<void> => {
4848
const args = ['--mode=info']
4949

50-
await spawn.start(args, {
50+
await spawnStart(args, {
5151
dev: options.dev,
5252
})
5353

‎cli/lib/exec/open.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Debug from 'debug'
22
import util from '../util'
3-
import spawn from './spawn'
3+
import { start as spawnStart } from './spawn'
44
import { start as verifyStart } from '../tasks/verify'
55
import { processTestingType, checkConfigFile } from './shared'
66
import { exitWithError } from '../errors'
@@ -79,7 +79,7 @@ export const start = async (options: any = {}): Promise<any> => {
7979
try {
8080
const args = processOpenOptions(options)
8181

82-
return spawn.start(args, {
82+
return spawnStart(args, {
8383
dev: options.dev,
8484
detached: Boolean(options.detached),
8585
})

‎cli/lib/exec/run.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import _ from 'lodash'
22
import Debug from 'debug'
33
import util from '../util'
4-
import spawn from './spawn'
4+
import { start as spawnStart } from './spawn'
55
import { start } from '../tasks/verify'
66
import { exitWithError, errors } from '../errors'
77
import { processTestingType, throwInvalidOptionError, checkConfigFile } from './shared'
@@ -179,7 +179,7 @@ const runModule = {
179179

180180
debug('run to spawn.start args %j', args)
181181

182-
return spawn.start(args, {
182+
return spawnStart(args, {
183183
dev: options.dev,
184184
})
185185
} catch (err: any) {

0 commit comments

Comments
 (0)