Opened 7 years ago

Closed 7 years ago

#823 closed task (fixed)

Tweak GitHub mirror settings

Reported by: mloskot Owned by: mloskot
Priority: major Milestone:
Component: Default Version:
Severity: Unassigned Keywords: git, github
Cc:

Description (last modified by mloskot)

Although we agreed to accept contributions via GitHub, it needs extra care to be taken.

GEOS on GitHub does:

  • Allow pull requests
  • Disallow merging with the green button on GitHub

Possibly, the mirror repo settings needs to be tweaked to support this workflow.

Work with Mirror on GitHub

GitHub mirror is updated with git push --mirror destroying any branch which is not in the upstream (gogs). So, PRs must be submitted from contributor's own fork to avoid feature branches destruction.

Settings for Mirror on GitHub

Configure Protected Branches

Note, we do not Disable Merge Button until commit changes are approved by a peer, because that would block case when a particular developer wants to commit directly to upstream branch with prior CI-tested PR on GitHub - requesting others to review would be unnecessary. GitHub does not allow PRs self-reviewed by submitting contributor.

Screenshot shows recommended settings for protected branches.

List of protected branches:

  • svn-trunk
  • svn-X.Y

Attachments (1)

geos-github-settings.png (38.9 KB ) - added by mloskot 7 years ago.
Suggested settings for GitHub protected branches

Download all attachments as: .zip

Change History (5)

comment:1 by mloskot, 7 years ago

Description: modified (diff)

comment:2 by mloskot, 7 years ago

Description: modified (diff)

by mloskot, 7 years ago

Attachment: geos-github-settings.png added

Suggested settings for GitHub protected branches

comment:3 by mloskot, 7 years ago

Description: modified (diff)

comment:4 by mloskot, 7 years ago

Resolution: fixed
Status: assignedclosed

All settings done.

Note: See TracTickets for help on using tickets.