search

jenkinsci / gitlab-plugin

A Jenkins plugin for interfacing with GitLab
https://plugins.jenkins.io/gitlab-plugin/
GNU General Public License v2.0
1.43k stars 613 forks source link

Merge from master #1487

Closed MarkEWaite closed 1 year ago

MarkEWaite commented 1 year ago

Merge from master branch

It is easier to manage a long-lived branch that is a descendant of another branch by regularly using git merge from the upstream branch. This pull request merges the master branch and reduces the differences between this branch and the master branch to only be in the Jenkinsfile.

Long term, we'll let this be handled by https://github.com/jenkinsci/gitlab-plugin/actions/workflows/sync-project-branch.yml . That action is currently failing and I don't understand the failure message well enough to fix it.

krisstern commented 1 year ago

@MarkEWaite I think maybe we can do git pull origin master --allow-unrelated-histories instead.

krisstern commented 1 year ago

Also for fetch we could do git fetch origin --unshallow

MarkEWaite commented 1 year ago

Also for fetch we could do git fetch origin --unshallow

Thanks for detecting that. If the working git repository is being populated with a shallow fetch or a shallow clone, then that would explain the message about unrelated histories. Can you submit the pull request to update the GitHub action definition?

krisstern commented 1 year ago

Sure, I can do that