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

[GitHub Actions] When porting a PR, skip any merge commits #2456

Merged
merged 1 commit into from
Aug 23, 2023

Conversation

tdonohue
Copy link
Member

Port of DSpace/DSpace#9036 to dspace-angular

Description

Enables a brand new feature of the korthout/backport-action GitHub action we are using: https://github.com/korthout/backport-action/#merge_commits

Ensures that when a ported PR is created, merge commits are skipped (i.e. not cherry picked). Currently, if the original PR has a merge commit, the port will fail with an error.

Will merge immediately. This PR is just to document the minor config change

@tdonohue tdonohue added this to the 8.0 milestone Aug 23, 2023
@tdonohue tdonohue self-assigned this Aug 23, 2023
@tdonohue tdonohue merged commit 9b88da7 into DSpace:main Aug 23, 2023
6 checks passed
@tdonohue tdonohue deleted the skip_merge_commits_in_port_pr branch August 23, 2023 22:08
@tdonohue
Copy link
Member Author

Manually cherry-picked to dspace-7_x in fe8429e

4science-it pushed a commit to 4Science/dspace-angular that referenced this pull request Oct 28, 2024
[DSC-1893] Added space between item-alerts and breadcrumb

Approved-by: Andrea Barbasso
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

1 participant