Add upstream github action workflow

TAMULib / DSpace

(Official) The DSpace digital asset management system that powers your Institutional Repository

https://wiki.duraspace.org/display/DSDOC4x/Introduction

BSD 3-Clause "New" or "Revised" License

5 stars 0 forks source link

Add upstream github action workflow #189

Closed ghost closed 2 years ago

jsavell commented 3 years ago

I'm a little nervous about the cherry-picking.

When it comes time to merge https://github.com/DSpace/DSpace/commits/dspace-6_x into our custom 6x, we're going to end up with some double commits and that can throw off the git merge strategies.

I'm also not sure how else to get these commits into our custom 6x since the source branch has been deleted, short of merging all of dspace-6_x since the 6.3 release.

ghost commented 3 years ago

@jsavell that is exactly why I used cherry-picking instead of just copying the file. When upgrade merging upstream 6.4 shouldn't it recognize those? I thought cherry-picking was the solution to avoid conflicts. I do see they have different commit hashes.

I created an updated branch from all of 6.4-SNAPSHOT and it did not ant build.