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

Migrate from bors to GitHub merge queues #337

Merged
merged 3 commits into from Jul 11, 2023
Merged

Conversation

Bromeon
Copy link
Member

@Bromeon Bromeon commented Jul 10, 2023

Closes #255.

Extends the minimal-ci with a few more jobs that always run. One option would be to make this conditional on draft/ready PR, but that isn't done for now. We can adjust the number of jobs depending on what we find useful.

full-ci remains as is and will run whenever a PR reaches the front of the merge queue. It rebases the commits on master and thus always runs checks against the latest version.

For now, bors is still active, but I don't know if it can still be used with new branch protection rules. Over time, bors try will no longer be possible and has no equivalent in the merge queue. This should be OK by having a few more checks in the minimal CI; we could also add all checks there, with two stages (and 2nd only running after 1st passes).

@Bromeon Bromeon added feature Adds functionality to the library c: tooling CI, automation, tools labels Jul 10, 2023
@GodotRust
Copy link

API docs are being generated and will be shortly available at: https://godot-rust.github.io/docs/gdext/pr-337

@Bromeon
Copy link
Member Author

Bromeon commented Jul 10, 2023

Out of interest
bors try

bors bot added a commit that referenced this pull request Jul 10, 2023
@godot-rust godot-rust deleted a comment from bors bot Jul 10, 2023
@Bromeon
Copy link
Member Author

Bromeon commented Jul 10, 2023

Needed update of the bors config file.
bors try-
bors try

bors bot added a commit that referenced this pull request Jul 10, 2023
@bors
Copy link
Contributor

bors bot commented Jul 10, 2023

try

Build failed:

@Bromeon
Copy link
Member Author

Bromeon commented Jul 11, 2023

bors try

bors bot added a commit that referenced this pull request Jul 11, 2023
@bors
Copy link
Contributor

bors bot commented Jul 11, 2023

try

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@Bromeon Bromeon added this pull request to the merge queue Jul 11, 2023
Merged via the queue into master with commit c788355 Jul 11, 2023
13 checks passed
@Bromeon Bromeon deleted the feature/merge-queue branch July 11, 2023 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c: tooling CI, automation, tools feature Adds functionality to the library
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Migrate away from public bors instance
2 participants