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.

Sign up for GitHub

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

Jump to bottom

Rework CI (backport #696) #699

Merged
merged 2 commits into from
Jun 3, 2024
Merged

Rework CI (backport #696) #699

merged 2 commits into from
Jun 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 3, 2024

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

@pablogs9 @mergify
Rework CI (#696)
0114cf9 
(cherry picked from commit 3379e73)

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/nightly.yml
@mergify mergify bot added the conflicts label Jun 3, 2024
@mergify mergify bot requested a review from pablogs9 as a code owner June 3, 2024 07:27
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jun 3, 2024

Cherry-pick of 3379e73 has failed:

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

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:
	new file:   .github/workflows/pr.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml
	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 mentioned this pull request Jun 3, 2024
Merged
@pablogs9 pablogs9 merged commit 66051c1 into iron Jun 3, 2024
1 check passed
@pablogs9 pablogs9 deleted the mergify/bp/iron/pr-696 branch June 3, 2024 07:30
pablogs9 added a commit that referenced this pull request Jun 3, 2024
@mergify @pablogs9
Rework CI (backport #696) (#699)
0581504 
* Rework CI (#696)

(cherry picked from commit 3379e73)

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/nightly.yml

* Fix rebase

---------

Co-authored-by: Pablo Garrido <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pablogs9 pablogs9 Awaiting requested review from pablogs9 pablogs9 is a code owner

Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@pablogs9