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

exportGraphics 3d linestyle instancing (backport #7545) [release/4.11.x] #7831

Merged
merged 4 commits into from
Mar 28, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 12, 2025

Add test for linked imodel-native PR:

imodel-native: iTwin/imodel-native#1044


This is an automatic backport of pull request #7545 done by Mergify.

(cherry picked from commit 8796388)

# Conflicts:
#	common/config/rush/pnpm-lock.yaml
#	core/backend/package.json
#	test-apps/display-test-app/android/imodeljs-test-app/app/build.gradle
#	test-apps/display-test-app/ios/imodeljs-test-app/imodeljs-test-app.xcodeproj/project.pbxproj
#	tools/internal/ios/core-test-runner/core-test-runner.xcodeproj/project.pbxproj
@mergify mergify bot added the conflicts label Mar 12, 2025
@mergify mergify bot requested review from a team, aruniverse, calebmshafer and wgoehrig as code owners March 12, 2025 20:00
Copy link
Contributor Author

mergify bot commented Mar 12, 2025

Cherry-pick of 8796388 has failed:

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

You are currently cherry-picking commit 8796388df0.
  (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-backend/da4-export-graphics-symbols_2025-01-13-19-56.json
	new file:   core/backend/src/test/assets/3dLinestyle.bim
	modified:   core/backend/src/test/standalone/ExportGraphics.test.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   common/config/rush/pnpm-lock.yaml
	both modified:   core/backend/package.json
	both modified:   test-apps/display-test-app/android/imodeljs-test-app/app/build.gradle
	both modified:   test-apps/display-test-app/ios/imodeljs-test-app/imodeljs-test-app.xcodeproj/project.pbxproj
	both modified:   tools/internal/ios/core-test-runner/core-test-runner.xcodeproj/project.pbxproj

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

@DanRod1999 DanRod1999 merged commit ba8d4d2 into release/4.11.x Mar 28, 2025
14 checks passed
@DanRod1999 DanRod1999 deleted the mergify/bp/release/4.11.x/pr-7545 branch March 28, 2025 13:58
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.

5 participants