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 deployments (backport #3192) #3206

Merged
merged 2 commits into from
Jul 22, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 22, 2024

Description of Change

Update deployments


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

(cherry picked from commit 919a220)

# Conflicts:
#	.github/workflows/publish-release.yml
@mergify mergify bot added the conflicts label Jul 22, 2024
Copy link
Author

mergify bot commented Jul 22, 2024

Cherry-pick of 919a220 has failed:

On branch mergify/bp/release/stable/9.0/pr-3192
Your branch is up to date with 'origin/release/stable/9.0'.

You are currently cherry-picking commit 919a2209.
  (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:   .github/workflows/ci.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/publish-release.yml

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 mentioned this pull request Jul 22, 2024
@dansiegel dansiegel merged commit e553138 into release/stable/9.0 Jul 22, 2024
10 checks passed
@dansiegel dansiegel deleted the mergify/bp/release/stable/9.0/pr-3192 branch July 22, 2024 21:50
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.

1 participant