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

Fix DTA iOS compilation, and consume native from xcframework (backport #4151) #4163

Merged
merged 4 commits into from
Sep 1, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 24, 2022

This is an automatic backport of pull request #4151 done by Mergify.
Cherry-pick of 6f4d5ec has failed:

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

You are currently cherry-picking commit 6f4d5ec22d.
  (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:
	modified:   common/config/azure-pipelines/templates/core-build.yaml
	new file:   test-apps/display-test-app/.gitignore
	new file:   test-apps/display-test-app/assets/Settings/Schemas/.empty
	modified:   test-apps/display-test-app/ios/backend.config.js
	modified:   test-apps/display-test-app/ios/imodeljs-test-app/imodeljs-test-app.xcodeproj/project.pbxproj
	modified:   test-apps/display-test-app/ios/imodeljs-test-app/imodeljs-test-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	modified:   test-apps/display-test-app/ios/imodeljs-test-app/imodeljs-test-app/AppDelegate.swift
	modified:   test-apps/display-test-app/ios/imodeljs-test-app/imodeljs-test-app/ViewController.swift
	deleted:    test-apps/display-test-app/ios/scripts/installIosNativeLib.js
	modified:   test-apps/display-test-app/package.json

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   common/scripts/update-imodeljs-native-version.sh

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: Arun George <aruniverse@users.noreply.github.com>
Co-authored-by: Paul Connelly <22944042+pmconne@users.noreply.github.com>
Co-authored-by: Arun George <11051042+aruniverse@users.noreply.github.com>
Co-authored-by: Mark Schlosser <47000437+markschlosseratbentley@users.noreply.github.com>
(cherry picked from commit 6f4d5ec)

# Conflicts:
#	common/scripts/update-imodeljs-native-version.sh
@mergify mergify bot added the conflicts label Aug 24, 2022
@mergify mergify bot requested a review from a team August 24, 2022 20:40
@aruniverse aruniverse marked this pull request as draft August 24, 2022 20:44
@aruniverse aruniverse self-assigned this Aug 24, 2022
@skirby1996 skirby1996 marked this pull request as ready for review August 31, 2022 17:27
@calebmshafer
Copy link
Member

@aruniverse any reason to not get this merged? Just needs reviews?

@aruniverse
Copy link
Member

@aruniverse any reason to not get this merged? Just needs reviews?

Yep just needs review. Was waiting on that new addon which has been published before.

@aruniverse aruniverse enabled auto-merge (squash) September 1, 2022 13:09
@aruniverse
Copy link
Member

@pmconne mind taking a pass?

@aruniverse aruniverse merged commit a3eeba4 into release/3.3.x Sep 1, 2022
@aruniverse aruniverse deleted the mergify/bp/release/3.3.x/pr-4151 branch September 1, 2022 14:08
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.

4 participants