Skip to content

Commit

Permalink
Document how to achieve non-divergent dist-git branches
Browse files Browse the repository at this point in the history
  • Loading branch information
lbarcziova committed Dec 6, 2023
1 parent b713710 commit c323acc
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
7 changes: 6 additions & 1 deletion docs/configuration/downstream/pull_from_upstream.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ for the new upstream release and this Bugzilla is by default referenced in the d
`- Resolves rhbz#xz` and `- Resolves rhbz#xz` in the commit message. This behaviour can be customized
using [actions](/docs/configuration/actions#syncing-the-release).

This job utilizes the same logic as `propose_downstream` with the only
This job utilizes the same logic as [`propose_downstream`](/docs/configuration/upstream/propose_downstream) with the only
exception that it is defined and executed in dist-git.

## Requirements
Expand Down Expand Up @@ -54,6 +54,11 @@ For more details and customization options, also check
:::


:::info
Current default behaviour of the release syncing results in having divergent dist-git branches. If you want to avoid this,
please see the details [here](/docs/fedora-releases-guide#keeping-dist-git-branches-non-divergent).
:::

## Retriggering
Packagers with write access to the dist-git repository can retrigger the job
via a comment in any dist-git pull request:
Expand Down
5 changes: 5 additions & 0 deletions docs/configuration/upstream/propose_downstream.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ happen in Fedora dist-git - no builds. A pull request is created as a result.
You can also use the [aliases provided by Packit](/docs/configuration#aliases)
to not need to change the config file when the new system version is released.

:::info
Current default behaviour of the release syncing results in having divergent dist-git branches. If you want to avoid this,
please see the details [here](/docs/fedora-releases-guide#keeping-dist-git-branches-non-divergent).
:::

## Example

```yaml
Expand Down
21 changes: 21 additions & 0 deletions docs/fedora-releases-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,27 @@ This will take the Packit configuration file from the default branch of the dist

/packit pull-from-upstream --with-pr-config

## Keeping dist-git branches non-divergent
Packit currently syncs the release in a way that the branches become divergent (you can follow
the request to change this behaviour [here](https://github.com/packit/packit/issues/1724)).

However, if you wish to keep your dist-git branches in sync, you can configure Packit to propose updates exclusively
to `rawhide` (by specifying `dist_git_branches: fedora-rawhide`) and you can locally merge it with the stable release branches.
The following example demonstrates how to achieve this for a single branch (`f39` in this case):
```bash
# Clone the dist-git repository if you haven't done so already
fedpkg clone $PACKAGE
# or
git clone ssh://[email protected]/rpms/$PACKAGE.git
# Alternatively, pull the rawhide changes only
git pull origin rawhide
# Switch to the desired branch and merge it with the updated rawhide branch
git checkout f39
git merge rawhide
git push origin f39
```
## Koji build job
After having the dist-git content updated, you can easily automate also building in Koji.
You can simply configure Packit to react to the new commits in your dist-git repository and create
Expand Down

0 comments on commit c323acc

Please sign in to comment.