Skip to content

Changed bors commit message and added a reference in the PR template #42

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

Closed
wants to merge 5 commits into from
Closed

Changed bors commit message and added a reference in the PR template #42

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d3cdafd
Changed bors commit message and added a little reference in the PR te…
fhennig Dec 21, 2021
dbd742c
Configured bors to use squash merge
fhennig Dec 21, 2021
7dbe853
Merge branch 'main' into bors-commit-message
fhennig Dec 21, 2021
d4c5a35
Removed squash merge again
fhennig Dec 21, 2021
edae5f0
Merge branch 'bors-commit-message' of github.com:stackabletech/operat…
fhennig Dec 21, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Configured bors to use squash merge
  • Loading branch information
@fhennig
fhennig committed Dec 21, 2021
commit dbd742c6bfd449d9e6048d3c36c52edc010d072f
1 change: 1 addition & 0 deletions template/bors.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ status = [
'Run cargo deny (bans licenses sources)'
]
delete_merged_branches = true
use_squash_merge = true
Copy link
Contributor

@nightkr nightkr Dec 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had issues where squash merges didn't close the PR properly.

I'm also curious about what use-case you're trying to solve with squashing? Git itself can show the history as if every merge was a squash with git log --first-parent.
Copy link
Contributor Author

@fhennig fhennig Dec 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was mostly to emulate how we did it before I thought maybe it was on accident that you missed that. I also kind of liked that all my "WIP" commits don't show up in the final thing but I'm happy either way
Copy link
Contributor Author

@fhennig fhennig Dec 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed it for now
pr_status = [ 'license/cla' ]
timeout_sec = 7200
cut_body_after = "<!-- Commit message above. Everything below is not added to the message. Do not change this line! -->"
Copy link
Contributor

@nightkr nightkr Dec 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍