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

Update oidc-signin-tool to 4.3.7 (backport #7303) [release/4.9.x] #7304

Merged
merged 2 commits into from
Oct 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 30, 2024

Update oidc signin tool to latest to fix hanging tests


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

Co-authored-by: Gytis Čepkauskas <98940208+GytisCepk@users.noreply.github.com>
(cherry picked from commit 306fffe)

# Conflicts:
#	common/config/rush/pnpm-lock.yaml
#	example-code/app/package.json
#	example-code/snippets/package.json
#	full-stack-tests/rpc-interface/package.json
Copy link
Contributor Author

mergify bot commented Oct 30, 2024

Cherry-pick of 306fffe has failed:

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

You are currently cherry-picking commit 306fffe880.
  (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/ecschema-rpcinterface-tests/mike-fix-oidc-hang_2024-10-29-22-35.json
	new file:   common/changes/@itwin/rpcinterface-full-stack-tests/mike-fix-oidc-hang_2024-10-29-22-35.json
	modified:   common/config/azure-pipelines/templates/core-build.yaml
	modified:   full-stack-tests/backend/package.json
	modified:   full-stack-tests/core/package.json
	modified:   full-stack-tests/ecschema-rpc-interface/package.json
	modified:   test-apps/display-performance-test-app/package.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   common/config/rush/pnpm-lock.yaml
	both modified:   example-code/app/package.json
	both modified:   example-code/snippets/package.json
	both modified:   full-stack-tests/rpc-interface/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 October 30, 2024 14:13
@aruniverse aruniverse merged commit 0d4e352 into release/4.9.x Oct 30, 2024
16 checks passed
@aruniverse aruniverse deleted the mergify/bp/release/4.9.x/pr-7303 branch October 30, 2024 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants