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

Update CI (#396) #399

Merged
merged 1 commit into from
Nov 8, 2024
Merged

Update CI (#396) #399

merged 1 commit into from
Nov 8, 2024

Conversation

trungleduc
Copy link
Member

Backport #396

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 7, 2024

Binder 👈 Launch a Binder on branch trungleduc/jupyter-collaboration/backport

@davidbrochart
Copy link
Collaborator

Should we just rebase the suggestions branch on main instead of creating a PR?

@trungleduc
Copy link
Member Author

trungleduc commented Nov 7, 2024 •
edited
Loading

Should we just rebase the suggestions branch on main instead of creating a PR?

I don't have the right to rebase this branch. It would be great if you could set up the backport bot. Maybe @jtpio knows how to do?

@davidbrochart
Copy link
Collaborator

But even if we set up a backport bot, we will end up with a bunch of commits that are different from main, right?

@trungleduc
Copy link
Member Author

yep, but at least I don't need to ask you to rebase this branch every time.

@trungleduc trungleduc force-pushed the backport branch 2 times, most recently from e109409 to 403111d Compare November 7, 2024 16:26
@trungleduc @github-actions
Update CI (jupyterlab#396)
f889821 
* Update CI

* Add dev install script

* Automatic application of license header

* Add update snapshots workflow

* Update snapshots

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@trungleduc
Copy link
Member Author

@davidbrochart let's merge this?

@jtpio
Copy link
Member

jtpio commented Nov 7, 2024

@meeseeksdev hello

(to test if the bot is enabled here)

@lumberbot-app Lumberbot (App)
Copy link

lumberbot-app bot commented Nov 7, 2024

I'm Mr. Meeseek, @jtpio, Look at meee !

@davidbrochart
Copy link
Collaborator

@davidbrochart let's merge this?

I'm just a bit worried about when we merge branch suggestions into main. Won't we get a bunch of conflicts?

@trungleduc
Copy link
Member Author

trungleduc commented Nov 8, 2024 •
edited
Loading

@davidbrochart let's merge this?

I'm just a bit worried about when we merge branch suggestions into main. Won't we get a bunch of conflicts?

Theoretically no since we resolved conflicts on each backport PR. We can test it by merging this PR and then opening a PR to merge this branch to main. The diff should only be your code, not the code from this backport PR

@davidbrochart
Copy link
Collaborator

I agree that the diff should only be our code, but I think the backport PRs will still be seen as conflicts.
Anyway, let's see with this one as you said 👍

@davidbrochart davidbrochart merged commit 8ce9473 into jupyterlab:suggestions Nov 8, 2024
27 checks passed
@trungleduc trungleduc deleted the backport branch November 8, 2024 11:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidbrochart davidbrochart Awaiting requested review from davidbrochart

Assignees
No one assigned
Labels
maintenance Still Needs Manual Backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@trungleduc @davidbrochart @jtpio