Skip to main content

Submitting a Pull Request for Review

Please refrain from submitting a pull request for the following instances:

  • For a package that is yet to be accepted for inclusion by a member of the Solus Staff team. Search open package requests to see if there is an open request for the package. We welcome you to politely reach out via the package request issue or our Support room on Matrix if you deem the review of the request to be time-sensitive in nature.
  • If your pull request is a Work In Progress / WIP. Pull requests that are completed or are marked as request for comments (RFC) are accepted. For RFC request please ensure your patch title contains [RFC] and is marked as 'draft'. WIP patches clutter the issue tracker, make patch review by Solus Staff more time consuming, and introduce unnecessary work.

Final Branch Review​

At minimum, your pull request will include changes for the following files:

  • package.yml
  • pspec_*.xml

It may also include these files:

  • MAINTAINERS.md
  • monitoring.yml

Double check the package.yml to make sure the builddeps are in the right order, and that it otherwise adheres to the standards Solus has set.

If any additional files were required for the build, then you must also include the files/ directory. See Packaging Practices for more detail.

Many package builds may result in the automatic generation of an ABI report. These files start with abi_* and must also be included, as they allow simple tracking of changes to symbols and dependencies.

Take a final look over your commit message to make sure it has all the necessary information, and that the formatting is good. You can use this, which will show the most recent commit:

git log -1

Creating the Pull Request​

There are multiple ways to create a Pull Request with GitHub, either from the website, or from the command line.

In the package folder, push your local changes to a remote branch:

git push

info

If you've created your own branch, as recommended, the CLI tool will show you a new command to create and push to a remote branch matching the local one. Run this.

Once the commit is successfully pushed, you'll notice that a URL will be provided that will immediately allow you to create a pull request with your changes.

Run git status one last time to make sure your branch is clean. If it is:

  1. Open the link.
  2. Fill in a summary of your changes (usually the same as the commit message).
  3. Link any relevant issues:
    • If you want to link this pull request to an existing issue, simply mention it in the PR summary: The inclusion of <somepackage> fixes #123.
    • If you need a change to depend on another change, mention it in the PR summary too: Depends on #234.
  4. Double-check everything.
  5. Create the pull request!

Amending a Pull Request​

There may be times you need to make minor changes after submitting the pull request. For instance, you see something that needs correcting. To do this, you will need to amend your commit.

  1. Make your changes
  2. Stage your changes: git add .
  3. Amend the commit: git commit --amend
  4. Push the amended commit: git push --force

The web interface on GitHub will automatically update with the latest changes.

note

We want amended commits because of the way our tooling works. It expects that there is only one Git commit per package change.

Amending a Pull Request with multiple commits​

Sometimes, you may be submitting multiple packages in a single pull request, and one of them might need changes. The process is very similar to the above steps, but with a couple of additions.

  1. Rebase on the main branch: git rebase -i origin/main
  2. A text editor will open in your terminal (nano by default). Change the line or lines of the commits you want to change from pick to edit
  3. Save and close the editor (by default, Ctrl+s Ctrl+x)
  4. Make your changes
  5. Stage your changes: git add .
  6. Amend the commit: git commit --amend
  7. Continue the rebase: git rebase --continue
  8. Repeat steps 4 through 7 for all commits you wish to edit
  9. Push the amended stack: git push --force

Updating a Pull Request That Has Changes Requested​

Your pull request will be reviewed, and changes may be requested. This is normal. It's to ensure the quality of the packages in our repository and to make sure each PR adheres to our standards.

If you need to make changes in response to a review, follow the steps in the section above.

After the Pull Request is Accepted​

Once your pull request is accepted and merged, someone on the Solus Team will issue a build. Your new / updated package will be published to the unstable repos.

At this point you may delete the local and remote branches for this pull request.