Skip to content

Rework CI (backport #696)#697

Merged
pablogs9 merged 2 commits intorollingfrom
mergify/bp/rolling/pr-696
Jun 3, 2024
Merged

Rework CI (backport #696)#697
pablogs9 merged 2 commits intorollingfrom
mergify/bp/rolling/pr-696

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jun 3, 2024


This is an automatic backport of pull request #696 done by [Mergify](https://mergify.com).

(cherry picked from commit 3379e73)

# Conflicts:
#	.github/workflows/nightly.yml
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jun 3, 2024

Cherry-pick of 3379e73 has failed:

On branch mergify/bp/rolling/pr-696
Your branch is up to date with 'origin/rolling'.

You are currently cherry-picking commit 3379e73.
  (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
	new file:   .github/workflows/pr.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/nightly.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 requested a review from pablogs9 as a code owner June 3, 2024 07:27
@mergify mergify Bot added the conflicts label Jun 3, 2024
@mergify mergify Bot mentioned this pull request Jun 3, 2024
@pablogs9 pablogs9 merged commit dfd1c52 into rolling Jun 3, 2024
@pablogs9 pablogs9 deleted the mergify/bp/rolling/pr-696 branch June 3, 2024 07:30
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.

1 participant