This guide is still under development Trevor Bramwell
Contributor Roles
There are 3 project roles in Anuket:
Project Technical Leads (PTLs) - In charge of the technical direction of the project (also defined as a committers)
Committers - Write, review, and approve changes to the project
Contributors - Write and review changes to the project
To maintain these roles in Gitlab the following structure is in place:
The default branch (master or main) is protected, and requires CODEOWNER approval
to merge changes.
Committers are listed in the CODEOWNERS file as reviewers for all files
CODEOWNERS* @committer1 @committer2 ...
Everyone else is considered a contributor.
All active contributors (including committers) are given Developer
level permissions on the Anuket group.
Note: Users are not granted Maintainer rights as that would allow them to remove branch protections, force push, and modify license policies. Some maintainer
capabilities will be available to developers through the LFX project control center at a future date.
Contribution Process
There are two main workflows when contributing code on GitLab: branching and forking. Which one you use will depend on your need and level of access to a project. In all
cases the fork workflow is preferred.
The first step is to create a GitLab account. You'll need to have verify your account with a credit card before CI jobs can be ran in your personal or project forks.
If you'd prefer not to have to add a credit card you can click "Request Access" on the Anuket group, after creating an account. Once your access is approved, you can utilize CI through merge
requests (MRs) against Anuket projects.
GitLab Fork Workflow
Fork the project
After logging in, click on the "Fork" link at the top right of the project page.
Specify the Project name, Group (or user account) the project should be under, and the name for the fork as Project slug. Set the Visibility level to Public, and click "Fork project"
Setup mirroring - This will keep the project's default branch up-to-date in your fork so you can always start your work from the most recent changes to the project.
Alternatively you may manage this yourself by adding an extra 'upstream' git remote pointed at the original project, and routinely running 'git pull upstream/master','git push origin master' to update your fork.
Open Settings → Repository from the project sidebar.
Expand the "Mirroring repositories" section
Enter the Git Repository URL starting with https://gitlab.com/anuket and ending with /<project>.git
Check "Mirror only
Clone your fork
There is a "Clone" drop down on the fork project page which provides git URLs to clone over SSH or HTTPS (to be passed to git clone) or magic links to clone the project through Visual Studio Code.
Checkout a new branch to make your change
git checkout -b <mybranchname>
Edit the code, stage the changes (git add), and commit them to your branch
Remember to include a 'Signed-off-by' line on your commits ( git commit -s if on the command line).
In the UI: If you're going to be making more than one commit, uncheck 'Start a new merge request with these changes'
Push the branch to your fork
There will be a link returned in the console from running git push, which when clicked will automatically open a merge request to the upstream project.
You can also create the merge request manually from the Merge Request page of your fork.
Fill out the details of your merge request.
If you have multiple commits, write a detailed explanation about what you're asking to be merged in. You can also add "Draft: " to the title to signal that changes are still being made.
Wait for CI to pass and a committer (identified by the CODEOWNERS file) to review and merge.
If the project is utilizing hardware for their CI, a developer will need to approve your pipeline to run before it is tested.
GitLab Branch Workflow
Clone the project
edit, git add, commit
Write you change (remember to include `-s` to sign off commits: `git
commit -s`)
git push
Click the link from the message to open a merge request to the repository
If you have multiple commits, write a detailed explanation about what you're asking to be merged in.
Set the change to "Draft" if its still being worked on.
Wait for CI to pass and a CODEOWNER to review and merge.
Gitlab-CI
There is a lot of documentation available through Gitlab for building and maintaining .gitlab-ci.yml files.
Here are some useful references:
The Releng project also maintains some of templates for projects to use; Projects are under no obligation or requirement to use the templates provided by the Releng project.
Docker
--- include: - project: anuket/releng file: '/gitlab-templates/Docker.gitlab-ci.yml'
ReadTheDocs (RTD)
--- include: - project: anuket/releng file: '/gitlab-templates/RTD.gitlab-ci.yml'
Google Storage (GSutil install)
--- include: - project: anuket/releng file: '/gitlab-templates/GoogleStorage.gitlab-ci.yml'