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.

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

chore: merge develop into V13 #27020

Merged
merged 86 commits into from
Jun 13, 2023
Merged

chore: merge develop into V13 #27020

merged 86 commits into from
Jun 13, 2023

Conversation

AtofStryker
Copy link
Contributor

@AtofStryker AtofStryker commented Jun 13, 2023

  • Closes N/A

Additional details

I think I messed up the previous merge by an accidental squash and merge over generating a merge commit, which is why you see the history show up here. easiest fix is to merge in the commits so git can track it

Steps to test

How has the user experience changed?

PR Tasks

MikeMcC399 and others added 30 commits May 3, 2023 11:22
…26664)

* dependency(deps): update dependency engine.io to v6.4.2 [security]

* updating changelog

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Matt Schile <[email protected]>
Co-authored-by: cypress-bot[bot] <+cypress-bot[bot]@users.noreply.github.com>
Co-authored-by: Ryan Manuel <[email protected]>
* fix: move `types` condition to the front

* chore: update changelog

* optimize deps for vite

* update config

* try optimizeDeps.include

* missing dep

---------

Co-authored-by: Lachlan Miller <[email protected]>
* Revert "fix: correctly resolve dependencies for CT onboarding when using Yarn Plug n Play (#26452)"

This reverts commit 7a33f5c.

* changelog

* changelog
Co-authored-by: cypress-bot[bot] <+cypress-bot[bot]@users.noreply.github.com>
Co-authored-by: Ryan Manuel <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Chris Breiding <[email protected]>
* chore: set up instrumentation and instrument middleware

* chore: set up console exporter

* chore: add parent span option to telemetry package

* chore: set up telemetry verbose mode

* chore: instrument the network proxy - part 1

* chore: make sure to terminate spans when request is aborted

* fix telemetry, create/end the request middle prior to sending the outbound request

* avoid telemetry ts build step, create entrypoint into packages/telemetry using TS conventions

* allow env vars to be "true" or "1"

* when creating child span, inherit their attributes directly from the parent

* create custom honeycomb exporter and span processor to log traces

* remove duplicate code that's already called in this.setRootContext

* cleanup

* more clean up

* update honeycomb network:proxy attributes, update console.log message

* yarn lock

* chore: remove performance API in middleware

* chore: end response on correct event

* recursively gather parent attributes on close

* added key and some clean up

* github action detector, move verbose into index, verbose log commands

* some tests

* clean up honeycomb exporter

* some renaming

* testing console trace link exporter

* Don't lose the top span when running in verbose.

* link to the right place for prod/dev

* changes to verbose to make sure it is read in the browser

* Apply suggestions from code review

* pass parent attributes between telemetry instances

* default to false

* 'fix' build issues

* src not dist

* add back on start span

* once more with feeling

* Fix some tests

* try this i guess

* revert auto build

* Apply suggestions from code review

Co-authored-by: Bill Glesias <[email protected]>

* support failed commands

* Address PR comments

* Address PR Comments

* error handling

* handle all the errors

---------

Co-authored-by: Bill Glesias <[email protected]>
Co-authored-by: Brian Mann <[email protected]>
* chore: add empty nx.json [run ci]

* chore: add nx cloud runner [run ci]

* chore: add nx-cloud dep [run ci]

* chore: update local nx cloud accessToken to be read-only
* feat(app): update DebugError copy

* feat: set isUsingGit project flag and consume in DebugContainer

* feat(app): update not using git icon for DebugError

* feat(app): displays alert on runs page when not using git

* feat(app): add component for when no runs for current branch

* feat(app): add warning for no runs for branch on runs container

* chore: add feat to CHANGELOG

* chore: remove logged status value

* chore: resolve import from merge conflict

* test(app): stub branch name for e2e runs spec

* chore: add line break in changelog entry

* chore: cleanup PR

* chore: fix i18n import for DebugBranchError

* chore: add utm and update Warning links to inline

* chore: capitalize Git in i18n

* ref: warning liink

* test: add i18n to tests

* test(app): change utm_source assertions

* chore: cleanup pr

* chore: remove unused prop

* test(app): remove no git warning when moving to runs page in e2e

* chore: change template logic

* chore: remove duplicate RUNS_TAB_MEDIUM const

* Changed Debug test assertion and reordered new components for Debug

---------

Co-authored-by: Stokes Player <[email protected]>
jordanpowell88 and others added 11 commits June 8, 2023 08:56
* chore: remove low value percy snapshots

* chore: remove more low value percy snapshots [run ci]

* chore: remove more low value percy snapshots

* remove additional snapshots

* reduce snapshots

* fix types

---------

Co-authored-by: Lachlan Miller <[email protected]>
* chore: print the video path whether or not compression is on or fails

* chore: fix video replacement regex

* chore: add bugfix entry
…#26810)

* chore: allow users to pass true to videoCompression config and only allow valudes 1-51 inclusively to be passed in

* run ci

* chore: allow zero to be option for CRF as we will coerve it to false and skip compression to have a lossless video, which has the same effect

* Update cli/CHANGELOG.md

* chore: update videoCompression types

* chore: update changelog

* Update cli/CHANGELOG.md

* Update cli/types/cypress.d.ts

Co-authored-by: Emily Rohrbough <[email protected]>

* Update packages/config/src/validation.ts

Co-authored-by: Emily Rohrbough <[email protected]>

* chore: update config snapshots

* Update packages/config/test/validation.spec.ts

Co-authored-by: Emily Rohrbough <[email protected]>

* chore: add system test on videoCompression=true coersion

* chore: document 0 as being false and not a valid CRF option for cypress video compression and make CRF valid values 1-51

* chore: fix types

* chore: fix types

* chore: fix change to log as feature and not bugfix

* chore: fix server side unit tests

---------

Co-authored-by: Emily Rohrbough <[email protected]>
* chore: adding new kpi report workflow

---------

Co-authored-by: Matt Schile <[email protected]>
* use headless new

* build more things

* test fixes

* flex based on version

* tests

* update changelog

* Apply suggestions from code review

Co-authored-by: Emily Rohrbough <[email protected]>

---------

Co-authored-by: Emily Rohrbough <[email protected]>
* chore: fix flaky windows tests

* add windows to CI

* try windows again
… path (#26973)

* fix(data-context): update runSpec mutation to support absolute spec path

* test(app): add currentProject to failin e2e runSpec test

* chore(data-context): use path.relative

* chore(graphql): update runSpec specPath description
@AtofStryker AtofStryker force-pushed the v13-develop-merge branch 2 times, most recently from a0748f5 to b9afaab Compare June 13, 2023 18:36
@AtofStryker AtofStryker changed the title V13 develop merge chore: merge develop into V13 Jun 13, 2023
@AtofStryker AtofStryker force-pushed the v13-develop-merge branch 10 times, most recently from 9a73fdd to 08654dc Compare June 13, 2023 18:54
@cypress
Copy link

cypress bot commented Jun 13, 2023

4 flaky tests on run #47590 ↗︎

0 5193 77 0 Flakiness 4

Details:

Merge branch 'develop' into v13
Project: cypress Commit: 6775d7725c
Status: Passed Duration: 13:45 💡
Started: Jun 13, 2023 7:45 PM Ended: Jun 13, 2023 7:59 PM
Flakiness  commands/net_stubbing.cy.ts • 1 flaky test • 5x-driver-electron

View Output Video

Test Artifacts
network stubbing > intercepting request > can delay and throttle a StaticResponse Output Video
Flakiness  cypress/cypress.cy.js • 3 flaky tests • 5x-driver-electron

View Output Video

Test Artifacts
... > correctly returns currentRetry Output Video
... > correctly returns currentRetry Output Video
... > correctly returns currentRetry Output Video

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

@AtofStryker
Copy link
Contributor Author

CI passing. merging in

@AtofStryker AtofStryker merged commit a5141a5 into v13 Jun 13, 2023
@AtofStryker AtofStryker deleted the v13-develop-merge branch June 13, 2023 20:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.