Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 17, 2025

  • Resolve GHSA-9crc-q9x8-hgqq
  • Resolve GHSA-vjh7-7g9h-fjfh
  • Consume vitest 3.0.5 (and adjacent vitest packages like browser, coverage-v8.
  • All vitest deps follow the same version number, to avoid dependency mismatch warnings when running tests.
  • Bump core-geometry's global testTimeout to a minute - there's no slowdown to the CI times or locally, since the tests are running in parallel.
  • Drop coverage reporting in core-frontend until the dynamic imports issue can be resolved (Opened issue).
  • Import core-frontend's barrel file before running any core-frontend test suite.
  • Enable parallel tests in core-frontend again. (This helps counteract the performance slowdown importing the barrel file above will have)
    This is an automatic backport of pull request Use vitest v3, Resolve GHSA-9crc-q9x8-ghqq  #7340 done by Mergify.
  • Switch agent pools for CI runs, improving build times by 4 mins on Windows and Linux

Co-authored-by: Arun George <[email protected]>
(cherry picked from commit ffa6c0f)

# Conflicts:
#	common/config/rush/pnpm-lock.yaml
#	core/bentley/package.json
#	core/common/package.json
#	core/frontend/src/test/setupTests.ts
#	core/geometry/package.json
#	core/quantity/package.json
@mergify
Copy link
Contributor Author

mergify bot commented Feb 17, 2025

Cherry-pick of ffa6c0f has failed:

On branch mergify/bp/release/4.11.x/pr-7340
Your branch is up to date with 'origin/release/4.11.x'.

You are currently cherry-picking commit ffa6c0f45c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   common/changes/@itwin/core-bentley/nam-fix-mismatch-vitest_2024-11-08-16-42.json
	new file:   common/changes/@itwin/core-common/nam-fix-mismatch-vitest_2024-11-08-16-42.json
	new file:   common/changes/@itwin/core-frontend/nam-fix-mismatch-vitest_2024-11-08-16-42.json
	new file:   common/changes/@itwin/core-geometry/nam-fix-mismatch-vitest_2024-11-08-16-42.json
	new file:   common/changes/@itwin/core-quantity/nam-fix-mismatch-vitest_2025-02-11-16-39.json
	modified:   core/frontend/package.json
	modified:   core/frontend/src/test/render/webgl/Technique.test.ts
	modified:   core/frontend/vitest.config.mts
	modified:   core/geometry/src/test/SimpleFactory.ts
	modified:   core/geometry/src/test/curve/Arc3d.test.ts
	modified:   core/geometry/vitest.config.mts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   common/config/rush/pnpm-lock.yaml
	both modified:   core/bentley/package.json
	both modified:   core/common/package.json
	both modified:   core/frontend/src/test/setupTests.ts
	both modified:   core/geometry/package.json
	both modified:   core/quantity/package.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from a team as a code owner February 17, 2025 16:49
@mergify mergify bot assigned hl662 Feb 17, 2025
@mergify mergify bot requested a review from a team February 17, 2025 16:50
@hl662 hl662 requested a review from a team as a code owner February 17, 2025 17:02
@hl662 hl662 removed the conflicts label Feb 17, 2025
@hl662 hl662 changed the title Use vitest v3, Resolve GHSA-9crc-q9x8-ghqq (backport #7340) [release/4.11.x] Use vitest v3, Resolve GHSA-9crc-q9x8-ghqq, GHSA-vjh7-7g9h-fjfh (backport #7340) [release/4.11.x] Feb 18, 2025
@aruniverse aruniverse merged commit ea1d791 into release/4.11.x Feb 19, 2025
16 checks passed
@aruniverse aruniverse deleted the mergify/bp/release/4.11.x/pr-7340 branch February 19, 2025 20:07
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.

6 participants