Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Merge develop into release/13.0.0 #25668

Merged
merged 11 commits into from
Feb 1, 2023
Merged

chore: Merge develop into release/13.0.0 #25668

merged 11 commits into from
Feb 1, 2023

Conversation

BlueWinds
Copy link
Contributor

Merging develop into 13.0.0

CarbonCollins and others added 11 commits January 30, 2023 14:53
@CarbonCollins @emilyrohrbough @AtofStryker
fix: match alternate edge version string format (#25457)
53db0ea 
* fix: match alternate edge version string format

* chore: add changelog entry

* Apply suggestions from code review

* Update cli/CHANGELOG.md

* Update cli/CHANGELOG.md

* chore: update changelog to release on Tuesday for 12.5

* [run ci]

---------

Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
Co-authored-by: Bill Glesias <bglesias@gmail.com>
@emilyrohrbough
chore: Use upstream cypress-testing-library again (#25548)
09091d2 
* chore: Use upstream cypress-testing-library again

* Update cypress-example-kitchensink commit hash

* Revert "Update cypress-example-kitchensink commit hash"

This reverts commit 8de5d1f.

---------

Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
@renovate @AtofStryker
fix(deps): update dependency underscore.string to v3.3.6 🌟 (#25574)
ee97b94 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Bill Glesias <bglesias@gmail.com>
@warrensplayer @ZachJW34
@amehta265 @elevatebart @rockindahizzy @emilyrohrbough @marktnoonan @mike-plummer @astone123 @lmiller1990
feat: Debug page [IATR] (#25488)
660ff67 
Co-authored-by: Zachary Williams <ZachJW34@gmail.com>
Co-authored-by: Ankit <ankit@cypress.io>
Co-authored-by: Stokes Player <stokes.player@gmail.com>
Co-authored-by: elevatebart <bart@cypress.io>
Co-authored-by: Rocky <25568640+rockindahizzy@users.noreply.github.com>
Co-authored-by: Stokes Player <stokes@cypress.io>
Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
Co-authored-by: Mark Noonan <mark@cypress.io>
Co-authored-by: Mike Plummer <mikep@cypress.io>
Co-authored-by: amehta265 <65267668+amehta265@users.noreply.github.com>
Co-authored-by: Adam Stone-Lord <adams@cypress.io>
Co-authored-by: Mike Plummer <mike-plummer@users.noreply.github.com>
Co-authored-by: Lachlan Miller <lachlan.miller.1990@outlook.com>
@emilyrohrbough
chore: fix changlelog section parsing and reference right ENV (#25633)
6f1653c
@ZachJW34
test: skip flaky migration test (#25378)
b84cb74
@jennifer-shehane
chore: Update README to add Cloud badges (#25645)
ae9488f
@mschile @emilyrohrbough
perf: remove reporter logs for collapsed tests in run mode (#25632)
facfd0d 
Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
@emilyrohrbough
chore: 12.5.0 release (#25648)
a3858d7
@renovate @ZachJW34 @emilyrohrbough
dependency: update dependency simple-git to v3.16.0 [security] (#25603)
92a07c6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Zachary Williams <zachjw34@gmail.com>
Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
@emilyrohrbough
chore: renovate semantic types and percy ci updates (#25651)
dbc69b4
@emilyrohrbough emilyrohrbough changed the title Merge develop into release/13.0.0 chore: Merge develop into release/13.0.0 Feb 1, 2023
@cypress
Copy link

cypress bot commented Feb 1, 2023 •
edited
Loading

7 flaky tests on run #43685 ↗︎

0 5654 74 0 Flakiness 7

Details:

chore: renovate semantic types and percy ci updates (#25651)
Project: cypress Commit: dbc69b47b5
Status: Passed Duration: 14:00 💡
Started: Feb 1, 2023 7:15 PM Ended: Feb 1, 2023 7:29 PM
Flakiness  e2e/origin/cookie_behavior.cy.ts • 4 flaky tests • 5x-driver-electron

View Output Video

Test
... > same site / cross origin > XMLHttpRequest > sets cookie on same-site request if withCredentials is true, and attaches to same-site request if withCredentials is true
... > same site / cross origin > fetch > sets same-site cookies if "include" credentials option is specified from request, but does not attach same-site cookies to request by default (same-origin)
... > same site / cross origin > XMLHttpRequest > sets cookie on same-site request if withCredentials is true, and attaches to same-site request if withCredentials is true
... > same site / cross origin > fetch > sets same-site cookies if "include" credentials option is specified from request, but does not attach same-site cookies to request by default (same-origin)
Flakiness  cypress/cypress.cy.js • 3 flaky tests • 5x-driver-electron

View Output Video

Test
... > correctly returns currentRetry
... > correctly returns currentRetry
... > correctly returns currentRetry

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@BlueWinds BlueWinds merged commit ef507c6 into release/13.0.0 Feb 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flotwig flotwig flotwig approved these changes

@emilyrohrbough emilyrohrbough emilyrohrbough approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@BlueWinds @flotwig @emilyrohrbough @CarbonCollins @warrensplayer @ZachJW34 @jennifer-shehane @mschile