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

Detect commit squashing and preserve signatures #2144

Merged
merged 44 commits into from
Feb 5, 2024
Merged

Detect commit squashing and preserve signatures #2144

merged 44 commits into from
Feb 5, 2024

Conversation

iarspider
Copy link
Contributor

No description provided.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @iarspider for branch master.

@iarspider, @smuzaffar, @cmsbuild, @aandvalenzuela can you please review it and eventually sign? Thanks.
@rappoccio, @antoniovilela, @sextonkennedy you are the release manager for this.
cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 11, 2024 •
edited
Loading

cms-bot internal usage

@iarspider iarspider force-pushed the preserve-signatures-on-squash branch from e380ee5 to b42a074 Compare January 11, 2024 11:03
@cmsbuild
Copy link
Contributor

Pull request #2144 was updated.

@iarspider iarspider force-pushed the preserve-signatures-on-squash branch from b42a074 to 932ef5b Compare January 11, 2024 11:07
@cmsbuild
Copy link
Contributor

Pull request #2144 was updated.

@iarspider
Copy link
Contributor Author

The function at https://github.com/cms-sw/cms-bot/pull/2144/files#diff-f37d46a488510bd0b96fd201ff189f8a704b756502df6a1cd46b117986e608a4R380 is needed because of API changes in python module.

I would also prefer to keep commit cache in bot_cache["commit"], similar to how reactions are kept in bot_cache["emoji"]. This way we won't need to filter bot_cache every time.

@iarspider
Copy link
Contributor Author

Tested here: iarspider-cmssw/cmssw#10 . First squash was pure squash (i.e. no additional changes), second one was dirty (additional modification of README file)

smuzaffar
smuzaffar reviewed Jan 11, 2024
View reviewed changes
process_pr.py Outdated Show resolved Hide resolved
@cmsbuild
Copy link
Contributor

Pull request #2144 was updated.

smuzaffar
smuzaffar reviewed Jan 11, 2024
View reviewed changes
process_pr.py Outdated Show resolved Hide resolved
smuzaffar
smuzaffar reviewed Jan 11, 2024
View reviewed changes
process_pr.py Outdated Show resolved Hide resolved
@cmsbuild
Copy link
Contributor

Pull request #2144 was updated.

@iarspider iarspider mentioned this pull request Jan 11, 2024
Merged
@iarspider iarspider force-pushed the preserve-signatures-on-squash branch from c173a35 to 0cfe01b Compare January 12, 2024 08:49
@cmsbuild
Copy link
Contributor

Pull request #2144 was updated.

smuzaffar
smuzaffar reviewed Jan 12, 2024
View reviewed changes
process_pr.py Outdated Show resolved Hide resolved
smuzaffar
smuzaffar reviewed Jan 15, 2024
View reviewed changes
process_pr.py Outdated Show resolved Hide resolved
@cmsbuild
Copy link
Contributor

Pull request #2144 was updated.

@iarspider iarspider force-pushed the preserve-signatures-on-squash branch from 97e740b to 5c6ab81 Compare January 18, 2024 09:59
@cmsbuild
Copy link
Contributor

Pull request #2144 was updated.

4 similar comments
@cmsbuild
Copy link
Contributor

Pull request #2144 was updated.

@cmsbuild
Copy link
Contributor

Pull request #2144 was updated.

@cmsbuild
Copy link
Contributor

Pull request #2144 was updated.

@cmsbuild
Copy link
Contributor

Pull request #2144 was updated.

@iarspider
Copy link
Contributor Author

Tested on iarspider-cmssw/cmssw#11

@cmsbuild
Copy link
Contributor

Pull request #2144 was updated.

@iarspider
[draft] Mark all new commits as having no files on clean squash (#2163)
d74428f 
* [draft] Mark all new commits as having no files on clean squash

* Changes from review
@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2024

Pull request #2144 was updated.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2024

Pull request #2144 was updated.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2024

Pull request #2144 was updated.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2024

Pull request #2144 was updated.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2024

Pull request #2144 was updated.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2024

Pull request #2144 was updated.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2024

Pull request #2144 was updated.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2024

Pull request #2144 was updated.

@smuzaffar smuzaffar mentioned this pull request Feb 1, 2024
Closed
@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2024

Pull request #2144 was updated.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 1, 2024

Pull request #2144 was updated.

@smuzaffar smuzaffar mentioned this pull request Feb 2, 2024
Closed
@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2024

Pull request #2144 was updated.

@smuzaffar smuzaffar mentioned this pull request Feb 2, 2024
Closed
@smuzaffar smuzaffar merged commit 6139c1e into master Feb 5, 2024
3 of 4 checks passed
@smuzaffar smuzaffar deleted the preserve-signatures-on-squash branch February 16, 2024 10:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@smuzaffar smuzaffar smuzaffar left review comments

Assignees
No one assigned
Labels
externals-pending orp-pending pending-signatures tests-pending
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@iarspider @cmsbuild @smuzaffar