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

ci(submodule): don't use remote branch HEAD (backport #1667) #1668

Merged
merged 2 commits into from
Sep 11, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 11, 2023

This is an automatic backport of pull request #1667 done by Mergify.
Cherry-pick of 0d3cbf9 has failed:

On branch mergify/bp/cryostat-v2.3/pr-1667
Your branch is up to date with 'origin/cryostat-v2.3'.

You are currently cherry-picking commit 0d3cbf91.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

Signed-off-by: Elliott Baron <[email protected]>
(cherry picked from commit 0d3cbf9)

# Conflicts:
#	.github/workflows/ci-jobs.yml
@mergify mergify bot added the conflicts label Sep 11, 2023
@mergify mergify bot assigned ebaron Sep 11, 2023
@github-actions
Copy link
Contributor

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

1 similar comment
@github-actions
Copy link
Contributor

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

Signed-off-by: Elliott Baron <[email protected]>
@github-actions
Copy link
Contributor

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

@ebaron ebaron merged commit 8743b7b into cryostat-v2.3 Sep 11, 2023
9 of 10 checks passed
@ebaron ebaron added ci and removed conflicts labels Sep 11, 2023
@mergify mergify bot deleted the mergify/bp/cryostat-v2.3/pr-1667 branch September 11, 2023 23:07
ebaron added a commit that referenced this pull request Sep 12, 2023
* ci(submodule): don't use remote branch HEAD (#1667)

Signed-off-by: Elliott Baron <[email protected]>
(cherry picked from commit 0d3cbf9)

# Conflicts:
#	.github/workflows/ci-jobs.yml

* Resolve conflicts

Signed-off-by: Elliott Baron <[email protected]>

---------

Signed-off-by: Elliott Baron <[email protected]>
Co-authored-by: Elliott Baron <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant